Skip to content

Commit

Permalink
Add tmux to the Docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
carlesfernandez committed May 17, 2024
1 parent 3096c2d commit b27e970
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Docker image to build Geniux images.

ARG base_image_version=1.8
ARG base_image_version=1.9
FROM yocto-geniux-base:v${base_image_version}
LABEL version="3.2" description="Geniux builder" maintainer="carles.fernandez@cttc.es"

Expand Down
3 changes: 2 additions & 1 deletion base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Yocto Geniux base image to help building Geniux.

FROM ubuntu:18.04
LABEL version="1.8" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"
LABEL version="1.9" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"

# Install all Linux packages required for Yocto builds, plus other packages used
# in this file below, and in the interactive mode
Expand Down Expand Up @@ -77,6 +77,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
sudo \
tar \
texinfo \
tmux \
ubuntu-keyring \
unzip \
util-linux \
Expand Down
3 changes: 2 additions & 1 deletion base-image/Dockerfile2
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Yocto Geniux base image to help building Geniux.

FROM ubuntu:20.04
LABEL version="2.2" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"
LABEL version="2.3" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"

# Install all Linux packages required for Yocto builds, plus other packages used
# in this file below, and in the interactive mode
Expand Down Expand Up @@ -76,6 +76,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
sudo \
tar \
texinfo \
tmux \
ubuntu-keyring \
unzip \
util-linux \
Expand Down
3 changes: 2 additions & 1 deletion base-image/Dockerfile3
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Yocto Geniux base image to help building Geniux.

FROM ubuntu:22.04
LABEL version="3.2" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"
LABEL version="3.3" description="Yocto Geniux base image" maintainer="carles.fernandez@cttc.es"


RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
Expand Down Expand Up @@ -73,6 +73,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
tftpd \
tar \
texinfo \
tmux \
ubuntu-keyring \
unzip \
util-linux \
Expand Down
6 changes: 3 additions & 3 deletions geniux-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ if [[ $GENIUX_VERSION == "rocko" || $GENIUX_VERSION == "sumo" || $GENIUX_VERSION
$GENIUX_VERSION == "gatesgarth" || $GENIUX_VERSION == "hardknott" || $GENIUX_VERSION == "honister" || \
$GENIUX_VERSION == "kirkstone" || $GENIUX_VERSION == "langdale" ]]
then
YOCTO_GENIUX_BASE_IMAGE_VERSION="1.8"
YOCTO_GENIUX_BASE_IMAGE_VERSION="1.9"
elif [[ $GENIUX_VERSION == "mickledore" ]]
then
YOCTO_GENIUX_BASE_IMAGE_VERSION="2.2"
YOCTO_GENIUX_BASE_IMAGE_VERSION="2.3"
else
YOCTO_GENIUX_BASE_IMAGE_VERSION="3.2"
YOCTO_GENIUX_BASE_IMAGE_VERSION="3.3"
fi

YOCTO_GENIUX_BASE_IMAGE="yocto-geniux-base:v$YOCTO_GENIUX_BASE_IMAGE_VERSION"
Expand Down

0 comments on commit b27e970

Please sign in to comment.