From c279f360fb7f8f1e189d34167fcb5b9140e93151 Mon Sep 17 00:00:00 2001 From: ngeojiajun-deriv Date: Wed, 17 Jul 2024 14:26:49 +0800 Subject: [PATCH 1/3] update dockerfile to use perl 5.40.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26b48a9..6df8ffb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="Deriv Services Ltd " # Some standard server-like config used everywhere ENV TZ=UTC ENV DEBIAN_FRONTEND=noninteractive -ENV PERL_VERSION=5.36.0 -ENV PERL_SHA256=0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 +ENV PERL_VERSION=5.40.0 +ENV PERL_SHA256=d5325300ad267624cb0b7d512cfdfcd74fa7fe00c455c5b51a6bd53e5e199ef9 ENV CPANM_VERSION=1.7045 ENV CPANM_SHA256=ac4e4adc23fec0ab54f088aca511f5a57d95e6c97a12a1cb98eed1fe0fe0e99c From 5c0c7b1f066fa6d75c695eafcde494ff31d73eb7 Mon Sep 17 00:00:00 2001 From: ngeojiajun-deriv Date: Tue, 14 Jan 2025 13:24:44 +0800 Subject: [PATCH 2/3] update the workflow --- .github/workflows/build_workflow.yml | 1 + .github/workflows/merged.yml | 9 +++++++-- Dockerfile | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index d30d81c..f84c039 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -5,6 +5,7 @@ on: push: branches: - master + - perl_40 pull_request: concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/merged.yml b/.github/workflows/merged.yml index 068f98f..dcffcca 100644 --- a/.github/workflows/merged.yml +++ b/.github/workflows/merged.yml @@ -5,6 +5,11 @@ on: push: branches: - master + - perl_40 + +env: + BRANCH_NAME: ${{ github.ref_name == "master" && 'latest' : github.ref_name }} + jobs: perl: runs-on: ubuntu-latest @@ -23,7 +28,7 @@ jobs: uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 with: context: '.' - tags: deriv/perl:latest + tags: deriv/perl:${{env.BRANCH_NAME}} push: true dzil: needs: perl @@ -43,7 +48,7 @@ jobs: uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 with: context: 'dzil/' - tags: deriv/dzil:latest + tags: deriv/dzil:${{env.BRANCH_NAME}} push: true hadolint: uses: ./.github/workflows/hadolint.yml diff --git a/Dockerfile b/Dockerfile index 6df8ffb..16fc167 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # This is the layer that can run things -FROM debian:stable +FROM debian:stable-slim LABEL maintainer="Deriv Services Ltd " # Some standard server-like config used everywhere From bfe665c5c777131e2f9090c9adac6b0c27ca7df8 Mon Sep 17 00:00:00 2001 From: ngeojiajun-deriv Date: Tue, 14 Jan 2025 13:36:12 +0800 Subject: [PATCH 3/3] fix the wokflow file --- .github/workflows/merged.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/merged.yml b/.github/workflows/merged.yml index dcffcca..b8d6b3b 100644 --- a/.github/workflows/merged.yml +++ b/.github/workflows/merged.yml @@ -8,7 +8,7 @@ on: - perl_40 env: - BRANCH_NAME: ${{ github.ref_name == "master" && 'latest' : github.ref_name }} + BRANCH_NAME: ${{ github.ref_name == "master" && 'latest' || github.ref_name }} jobs: perl: @@ -43,6 +43,11 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Pull the associated perl image + run: | + docker pull deriv/perl:${{env.BRANCH_NAME}} + docker tag deriv/perl:${{env.BRANCH_NAME}} deriv/perl:latest - name: Build And Publish Docker Image uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09