From 8f284bd107074bad8ee4033905c3e5395b591829 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 12 Sep 2023 08:25:08 +0200 Subject: [PATCH 1/5] push_to_docker_hub initial --- .github/workflows/push_to_docker_hub.yml | 18 +++--------------- docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/push_to_docker_hub.yml b/.github/workflows/push_to_docker_hub.yml index af93972b61f..f751f4d5b4b 100644 --- a/.github/workflows/push_to_docker_hub.yml +++ b/.github/workflows/push_to_docker_hub.yml @@ -5,7 +5,6 @@ on: # Allow to run manually branches: - 'develop' - - 'docker_hub_gha' push: tags: # Just create image on pushing a tag @@ -14,6 +13,7 @@ on: jobs: sagemath-dev: name: Build Docker image on target make-build and push to DockerHub sagemath-dev + # target make-build replaces former sagemath-dev, see https://github.com/sagemath/sage/pull/36047 runs-on: ubuntu-latest steps: - name: Checkout @@ -25,7 +25,7 @@ jobs: id: set_tag run: | git fetch --depth=1 origin +refs/tags/*:refs/tags/* - TAG_NAME=$(git tag --sort=v:refname | tail -1) + TAG_NAME=$(git tag --sort=creatordate | tail -1) TAG="sagemath/sagemath-dev:$TAG_NAME" TAG_LIST="$TAG, sagemath/sagemath-dev:develop" TAG_LIST="$TAG" # don't tag develop until meaning of sagemath-dev is clear @@ -41,15 +41,6 @@ jobs: echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - - name: Check env - run: | - echo ${{ env.TAG_NAME }} - echo ${{ env.TAG }} - echo ${{ env.TAG_LIST }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -84,7 +75,7 @@ jobs: id: set_tag run: | git fetch --depth=1 origin +refs/tags/*:refs/tags/* - TAG_NAME=$(git tag --sort=v:refname | tail -1) + TAG_NAME=$(git tag --sort=creatordate | tail -1) TAG="sagemath/sagemath:$TAG_NAME" TAG_LIST="$TAG, sagemath/sagemath:develop" BASE="sagemath/sagemath-dev:$TAG_NAME" @@ -100,9 +91,6 @@ jobs: echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/docker/Dockerfile b/docker/Dockerfile index 6b0ecab4795..359d59dd106 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -75,7 +75,7 @@ ARG MAKE_BUILD=make-build ################################################################################ # Image containing the run-time dependencies for Sage # ################################################################################ -FROM ubuntu:latest as run-time-dependencies +FROM ubuntu:jammy as run-time-dependencies LABEL maintainer="Erik M. Bray , Julian Rüth " # Set sane defaults for common environment variables. ENV LC_ALL C.UTF-8 From 3fa2df7cb850d13f6b0055626151f5c6c717f997 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 12 Sep 2023 08:26:34 +0200 Subject: [PATCH 2/5] push_to_docker_hub_fixes complete TAG_LIST --- .github/workflows/push_to_docker_hub.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push_to_docker_hub.yml b/.github/workflows/push_to_docker_hub.yml index f751f4d5b4b..bf404e33fce 100644 --- a/.github/workflows/push_to_docker_hub.yml +++ b/.github/workflows/push_to_docker_hub.yml @@ -37,7 +37,6 @@ jobs: id: upd_tag_list run: | TAG_LIST="${{ env.TAG_LIST }}, sagemath/sagemath-dev:latest" - TAG_LIST="${{ env.TAG_LIST }}" # don't tag latest until meaning of sagemath-dev is clear echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" From abc14c98611b0d539d2be0c8787dc8f7213bd11e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 12 Sep 2023 08:43:13 +0200 Subject: [PATCH 3/5] ush_to_docker_hub_fixes the missing one --- .github/workflows/push_to_docker_hub.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push_to_docker_hub.yml b/.github/workflows/push_to_docker_hub.yml index bf404e33fce..394e9550a45 100644 --- a/.github/workflows/push_to_docker_hub.yml +++ b/.github/workflows/push_to_docker_hub.yml @@ -28,7 +28,6 @@ jobs: TAG_NAME=$(git tag --sort=creatordate | tail -1) TAG="sagemath/sagemath-dev:$TAG_NAME" TAG_LIST="$TAG, sagemath/sagemath-dev:develop" - TAG_LIST="$TAG" # don't tag develop until meaning of sagemath-dev is clear echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV echo "TAG=$TAG" >> $GITHUB_ENV echo "TAG_LIST=$TAG_LIST" >> $GITHUB_ENV From 9ffa6e709bb337ed9b48af83bf4fbf621e507fc0 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 20 Sep 2023 18:47:35 +0200 Subject: [PATCH 4/5] dependabot upgrades --- .github/workflows/push_to_docker_hub.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push_to_docker_hub.yml b/.github/workflows/push_to_docker_hub.yml index f9be690a4dd..77a9f819d70 100644 --- a/.github/workflows/push_to_docker_hub.yml +++ b/.github/workflows/push_to_docker_hub.yml @@ -40,16 +40,16 @@ jobs: if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push make-build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: docker/Dockerfile @@ -90,16 +90,16 @@ jobs: if: "!contains(env.TAG_NAME, 'beta') && !contains(env.TAG_NAME, 'rc')" - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push sagemath - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: docker/Dockerfile From b427e02a3a0c7ee1f08580fb074e7e26ebd628ec Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 11 Oct 2023 18:50:22 +0200 Subject: [PATCH 5/5] 36385: add maintainer --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 359d59dd106..cc0701d8d81 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -76,7 +76,7 @@ ARG MAKE_BUILD=make-build # Image containing the run-time dependencies for Sage # ################################################################################ FROM ubuntu:jammy as run-time-dependencies -LABEL maintainer="Erik M. Bray , Julian Rüth " +LABEL maintainer="Erik M. Bray , Julian Rüth , Sebastian Oehms " # Set sane defaults for common environment variables. ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8