From 43b231e26b061bcc2ad2ba590a7c52ce3ac050a6 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 8 Mar 2017 13:48:35 +0100 Subject: Rename base images, push to 0xacab registry --- docker/README.md | 29 ++++++++++++++--------------- docker/jessie/Dockerfile | 29 ----------------------------- docker/jessie_amd64/Dockerfile | 29 +++++++++++++++++++++++++++++ docker/stretch/Dockerfile | 27 --------------------------- docker/stretch_amd64/Dockerfile | 27 +++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 71 deletions(-) delete mode 100644 docker/jessie/Dockerfile create mode 100644 docker/jessie_amd64/Dockerfile delete mode 100644 docker/stretch/Dockerfile create mode 100644 docker/stretch_amd64/Dockerfile diff --git a/docker/README.md b/docker/README.md index 64b0cd1..454a681 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,25 +1,24 @@ # Build new image -As an example we build a new version (2.2.0) of the leapcode/jessie base image: +As an example we build a new version of the `leap:jessie` base image: - IMAGE='jessie' + REGISTRY="0xacab.org:4567" + REGISTRY_PATH="${REGISTRY}/leap/gitlab-buildpackage" + IMAGE='jessie_amd64' -## Find latest version - -I.e. look at the tags at https://hub.docker.com/r/leapcode/ruby/tags/ or query tags with: + cd $IMAGE + docker ${DOCKER_OPTS} build ${DOCKER_BUILD_OPTS} -t ${REGISTRY_PATH}:${IMAGE} . - curl -s https://registry.hub.docker.com/v2/repositories/leapcode/$IMAGE/tags/ |jq '."results"[]["name"]' +## Package upgrades -## Build new version +Sometimes you need to upgrade packages in the base image, +so this is not done on every build, i.e. when security updates +are available. +Disable caching and build new images with: - VERSION='1.5' - cd $IMAGE - docker build --no-cache -t leapcode/${IMAGE}:${VERSION} . + export DOCKER_BUILD_OPTS="--no-cache" ## Push images - docker logout - docker login -u leapcode - docker tag leapcode/${IMAGE}:${VERSION} leapcode/${IMAGE}:latest - docker push leapcode/${IMAGE}:latest - docker push leapcode/${IMAGE}:${VERSION} + docker login --username=varac 0xacab.org:4567 + docker ${DOCKER_OPTS} push ${REGISTRY_PATH}:${IMAGE} diff --git a/docker/jessie/Dockerfile b/docker/jessie/Dockerfile deleted file mode 100644 index d63d771..0000000 --- a/docker/jessie/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:jessie-backports - -MAINTAINER LEAP Encryption Access Project -LABEL Description="Bare debian jessie baseimage with few customisation" Vendor="LEAP" Version="1.x" - - -RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list && \ - sed -i 's/httpredir/deb/' /etc/apt/sources.list.d/backports.list - -RUN apt-get update \ - && apt-get -y dist-upgrade \ - && apt-get install -y --no-install-recommends \ - git \ - leap-archive-keyring \ - locales \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ - apt-get update - -RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 - -RUN useradd -ms /bin/bash -G sudo cirunner - -# allow all members of sudo group to execute any command without password -RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers diff --git a/docker/jessie_amd64/Dockerfile b/docker/jessie_amd64/Dockerfile new file mode 100644 index 0000000..d63d771 --- /dev/null +++ b/docker/jessie_amd64/Dockerfile @@ -0,0 +1,29 @@ +FROM debian:jessie-backports + +MAINTAINER LEAP Encryption Access Project +LABEL Description="Bare debian jessie baseimage with few customisation" Vendor="LEAP" Version="1.x" + + +RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list && \ + sed -i 's/httpredir/deb/' /etc/apt/sources.list.d/backports.list + +RUN apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get install -y --no-install-recommends \ + git \ + leap-archive-keyring \ + locales \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ + apt-get update + +RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.utf8 + +RUN useradd -ms /bin/bash -G sudo cirunner + +# allow all members of sudo group to execute any command without password +RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers diff --git a/docker/stretch/Dockerfile b/docker/stretch/Dockerfile deleted file mode 100644 index 2db107b..0000000 --- a/docker/stretch/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM debian:stretch - -MAINTAINER LEAP Encryption Access Project -LABEL Description="Bare debian stretch baseimage with few customisation" Vendor="LEAP" Version="1.x" - -RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list - -RUN apt-get update \ - && apt-get -y dist-upgrade \ - && apt-get install -y --no-install-recommends \ - git \ - leap-archive-keyring \ - locales \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ - apt-get update - -RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 - -RUN useradd -ms /bin/bash -G sudo cirunner - -# allow all members of sudo group to execute any command without password -RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers diff --git a/docker/stretch_amd64/Dockerfile b/docker/stretch_amd64/Dockerfile new file mode 100644 index 0000000..2db107b --- /dev/null +++ b/docker/stretch_amd64/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:stretch + +MAINTAINER LEAP Encryption Access Project +LABEL Description="Bare debian stretch baseimage with few customisation" Vendor="LEAP" Version="1.x" + +RUN sed -i 's/httpredir/deb/' /etc/apt/sources.list + +RUN apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get install -y --no-install-recommends \ + git \ + leap-archive-keyring \ + locales \ + sudo && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +RUN echo "deb http://deb.leap.se/testing-platform jessie main" > /etc/apt/sources.list.d/leap.list && \ + apt-get update + +RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.utf8 + +RUN useradd -ms /bin/bash -G sudo cirunner + +# allow all members of sudo group to execute any command without password +RUN sed -i 's/^%sudo.*/%sudo ALL=(ALL) NOPASSWD:ALL/' /etc/sudoers -- cgit v1.2.3