Upgrade Alpine to 3.16 and Glibc to 2.35

Author: prantlf

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 image: docker:20
 services:
- - docker:dind
+ - docker:20-dind
 
 variables:
  GITLAB_TAG: $CI_REGISTRY_IMAGE
@@ -18,15 +18,16 @@ build:
  -v "${PWD}"/.hadolint.yaml:/.config/hadolint.yaml \
  hadolint/hadolint < Dockerfile-bin
  - docker build -t $GITLAB_TAG .
+ - docker tag $GITLAB_TAG prantlf/alpine-glibc
  - docker build -t $GITLAB_TAG_BIN -f Dockerfile-bin .
+ - docker tag $GITLAB_TAG_BIN prantlf/alpine-glibc:bin
  - docker tag $GITLAB_TAG $HUB_TAG
  - docker tag $GITLAB_TAG_BIN $HUB_TAG_BIN
  - echo -n "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
  - docker push $GITLAB_TAG
  - docker push $GITLAB_TAG_BIN
- - |
- mkdir -p $HOME/.docker
- echo '{ "auths": { "'https://index.docker.io/v1/'": { "auth": "'$DOCKER_AUTH'", "email": "prantlf@gmail.com" } } }' \
- > $HOME/.docker/config.json
+ - echo -n "$DOCKER_TOKEN" | docker login -u prantlf --password-stdin
  - docker push $HUB_TAG
  - docker push $HUB_TAG_BIN
+ except:
+ - tags

Dockerfile

@@ -1,9 +1,9 @@
-FROM alpine:3.15
+FROM alpine:3.16
 LABEL maintainer="Ferdinand Prantl <prantlf@gmail.com>"
 
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
- wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.34-r0/glibc-2.34-r0.apk && \
- apk update && apk add gzip glibc-2.34-r0.apk && \
+ wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk && \
+ apk update && apk add gzip glibc-2.35-r0.apk && \
  ln -sf /usr/glibc-compat/lib/ld-linux-x86-64.so.2 /usr/glibc-compat/lib/ld-linux-x86-64.so && \
  ln -sf /usr/glibc-compat/lib/libBrokenLocale.so.1 /usr/glibc-compat/lib/libBrokenLocale.so && \
  ln -sf /usr/glibc-compat/lib/libanl.so.1 /usr/glibc-compat/lib/libanl.so && \
@@ -22,14 +22,14 @@ RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/s
  ln -sf /usr/glibc-compat/lib/librt.so.1 /usr/glibc-compat/lib/librt.so && \
  ln -sf /usr/glibc-compat/lib/libthread_db.so.1 /usr/glibc-compat/lib/libthread_db.so && \
  ln -sf /usr/glibc-compat/lib/libutil.so.1 /usr/glibc-compat/lib/libutil.so && \
- rm glibc-2.34-r0.apk && \
- wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.34-r0/glibc-bin-2.34-r0.apk && \
- apk add glibc-bin-2.34-r0.apk && \
- rm glibc-bin-2.34-r0.apk && \
- wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.34-r0/glibc-i18n-2.34-r0.apk && \
- apk add glibc-i18n-2.34-r0.apk && \
- rm glibc-i18n-2.34-r0.apk /etc/apk/keys/sgerrand.rsa.pub && \
+ rm glibc-2.35-r0.apk && \
+ wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk && \
+ apk add glibc-bin-2.35-r0.apk && \
+ rm glibc-bin-2.35-r0.apk && \
+ wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-i18n-2.35-r0.apk && \
+ apk add glibc-i18n-2.35-r0.apk && \
+ rm glibc-i18n-2.35-r0.apk /etc/apk/keys/sgerrand.rsa.pub && \
  gunzip --keep /usr/glibc-compat/share/i18n/charmaps/UTF-8.gz && \
  /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 en_US.UTF-8 && \
- rm /usr/glibc-compat/share/i18n/charmaps/UTF-8 /var/cache/apk/* && \
- apk del glibc-bin glibc-i18n gzip
+ apk del glibc-bin glibc-i18n gzip && \
+ rm /usr/glibc-compat/share/i18n/charmaps/UTF-8 /var/cache/apk/*

Dockerfile-bin

@@ -2,10 +2,6 @@ FROM prantlf/alpine-glibc:latest
 LABEL maintainer="Ferdinand Prantl <prantlf@gmail.com>"
 
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
- wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.34-r0/glibc-bin-2.34-r0.apk && \
- apk add glibc-bin-2.34-r0.apk && \
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/ldd && \
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/sotruss && \
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/tzselect && \
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/xtrace && \
- rm glibc-bin-2.34-r0.apk /etc/apk/keys/sgerrand.rsa.pub /var/cache/apk/*
+ wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk && \
+ apk add --no-cache glibc-bin-2.35-r0.apk && \
+ rm glibc-bin-2.35-r0.apk /etc/apk/keys/sgerrand.rsa.pub

Makefile

@@ -1,5 +1,5 @@
 clean ::
-docker image rm alpine-glibc
+docker image rm alpine-glibc alpine-glibc:bin prantlf/alpine-glibc prantlf/alpine-glibc:bin
 
 lint ::
 docker run --rm -i \
@@ -11,18 +11,37 @@ lint ::
 
 build ::
 docker build -t alpine-glibc .
+docker tag alpine-glibc prantlf/alpine-glibc
 docker build -t alpine-glibc:bin -f Dockerfile-bin .
+docker tag alpine-glibc:bin prantlf/alpine-glibc:bin
 
 run ::
 docker run --rm -t -i alpine-glibc
 
-tag ::
-docker tag alpine-glibc prantlf/alpine-glibc
-docker tag alpine-glibc:bin prantlf/alpine-glibc:bin
-
 login ::
 docker login --username=prantlf
+docker login registry.gitlab.com --username=prantlf
 
 push ::
 docker push prantlf/alpine-glibc
 docker push prantlf/alpine-glibc:bin
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc:bin
+
+tag ::
+docker tag prantlf/alpine-glibc prantlf/alpine-glibc:3.16
+docker tag prantlf/alpine-glibc prantlf/alpine-glibc:3.16-2.35
+docker tag prantlf/alpine-glibc:bin prantlf/alpine-glibc:3.16-bin
+docker tag prantlf/alpine-glibc:bin prantlf/alpine-glibc:3.16-2.35-bin
+docker push prantlf/alpine-glibc:3.16
+docker push prantlf/alpine-glibc:3.16-2.35
+docker push prantlf/alpine-glibc:3.16-bin
+docker push prantlf/alpine-glibc:3.16-2.35-bin
+docker tag registry.gitlab.com/prantlf/docker-alpine-glibc registry.gitlab.com/prantlf/docker-alpine-glibc:3.16
+docker tag registry.gitlab.com/prantlf/docker-alpine-glibc registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-2.35
+docker tag registry.gitlab.com/prantlf/docker-alpine-glibc:bin registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-bin
+docker tag registry.gitlab.com/prantlf/docker-alpine-glibc:bin registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-2.35-bin
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc:3.16
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-2.35
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-bin
+docker push registry.gitlab.com/prantlf/docker-alpine-glibc:3.16-2.35-bin

README.md

@@ -10,13 +10,15 @@ If you have trouble pulling the image from the Docker's default hub.docker.com,
 
 Tags consist of versions of the Alpine Linux and GLIBC in this order, separated by a hyphen. The `latest` tag maps to the latest `<alpine>` tag. The latest `<alpine>` tag maps to the latest `<alpine>-<glibc>` tag. The `bin` and `<alpine>-bin` tags contain the `glibc-bin` package installed too.
 
-- [`latest`], `bin`, `3.15`, `3.15-bin`, `3.14`, `3.14-2.34`, `3.14-2.33`, `3.13`, `3.12`
+- [`latest`], `bin`
+- `3.16`, `3.16-bin`, `3.16-2.35`
+- `3.15`, `3.15-bin`, `3.14`, `3.14-2.34`, `3.14-2.33`, `3.13`, `3.12`
 
 ## Install
 
 ```
 docker pull prantlf/alpine-glibc
-docker pull prantlf/alpine-glibc:3.15
+docker pull prantlf/alpine-glibc:3.16
 ```
 
 ## Use
@@ -31,19 +33,6 @@ The final image can use the English locale by setting the environment variable `
 
 See the [`git-p4` Docker image repository] for an example.
 
-If you install `glibc-bin-2.34-r0.apk`, you will need to fix scripts that refer to `/usr/bin/bash`. For example:
-
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/ldd
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/sotruss
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/tzselect
- sed -i 's#/usr/bin/bash#/bin/sh#' /usr/glibc-compat/bin/xtrace
-
-Or you can create a symlink `bash` in `/usr/bin`:
-
- ln -s /bin/sh /usr/bin/bash
-
-The first way is used in this image tagged `bin` or `<alpine>-bin`.
-
 If you install `glibc-i18n-2.34-r0.apk` and create a locale by `/usr/glibc-compat/bin/localedef`, you will need to unpack the charmap. For example:
 
  gunzip --keep /usr/glibc-compat/share/i18n/charmaps/UTF-8.gz
@@ -61,12 +50,14 @@ The local image is built as `alpine-glibc` and pushed to the docker hub as `pran
  make build
  # Enter an interactive shell inside the created image:
  make run
- # Tag the local image for pushing:
- make tag
  # Login to the docker hub:
  make login
  # Push the local image to the docker hub:
  make push
+ # Push the local image to the docker hub:
+ make push
+ # Add version tags to the published image:
+ make tag
 
 ## License