Skip to content

Commit 7c640b1

Browse files
ImreSamuImreSamu
committed
some hard coded info refactored
1 parent 95bb569 commit 7c640b1

File tree

3 files changed

+34
-15
lines changed

3 files changed

+34
-15
lines changed

‎.github/workflows/buildx.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,17 @@ jobs:
7676
runs-on: ubuntu-latest
7777

7878
env:
79+
# Alpine image version
80+
ALPINE_VERSION: '3.16'
81+
# Workflow name for internal logic;
82+
# We are NOT the default ('main') workflow!
83+
WORKFLOW: buildx
84+
# Docker image Repo and Image name
85+
REPO_NAME: postgis
86+
IMAGE_NAME: postgis
87+
# Docker image version and variant
7988
VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}
8089
VARIANT: ${{ matrix.variant }}
81-
# Not the default (main) workflow!
82-
WORKFLOW: buildx
8390
# Docker image tag postfix
8491
TAG_POSTFIX: '-experimental'
8592

@@ -100,9 +107,9 @@ jobs:
100107
- name: "debug: docker buildx ls"
101108
run: docker buildx ls
102109

103-
- name: "debug: Inspect the base alpine image postgres:${{ matrix.postgres }}-alpine3.16"
110+
- name: "debug: Inspect the base alpine image postgres:${{ matrix.postgres }}-alpine${{ env.ALPINE_VERSION }} "
104111
if: ${{ env.VARIANT == 'alpine' }}
105-
run: docker pull --platform=${{ matrix.platforms }} postgres:${{ matrix.postgres }}-alpine3.16 && docker inspect postgres:${{ matrix.postgres }}-alpine3.16
112+
run: docker pull --platform=${{ matrix.platforms }} postgres:${{ matrix.postgres }}-alpine{{ env.ALPINE_VERSION }} && docker inspect postgres:${{ matrix.postgres }}-alpine{{ env.ALPINE_VERSION }}
106113
env:
107114
DOCKER_DEFAULT_PLATFORM: ${{ matrix.platforms }}
108115
PLATFORM: ${{ matrix.platforms }}
@@ -119,13 +126,13 @@ jobs:
119126
- name: "debug: docker images"
120127
run: docker images
121128

122-
- name: "debug: docker inspect postgis/postgis:${{ env.VERSION }}${{ env.TAG_POSTFIX }}"
129+
- name: "debug: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_POSTFIX }}"
123130
if: ${{ env.VARIANT == 'default' }}
124-
run: docker inspect postgis/postgis:${{ env.VERSION }}${{ env.TAG_POSTFIX }}
131+
run: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_POSTFIX }}
125132

126-
- name: "debug: docker inspect postgis/postgis:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}"
133+
- name: "debug: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}"
127134
if: ${{ env.VARIANT == 'alpine' }}
128-
run: docker inspect postgis/postgis:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}
135+
run: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}
129136

130137
- name: Login to dockerhub
131138
uses: docker/login-action@v1

‎.github/workflows/main.yml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,40 @@ jobs:
3939
runs-on: ubuntu-20.04
4040
continue-on-error: ${{ matrix.postgis == 'master' }}
4141
env:
42+
# Alpine image version
43+
ALPINE_VERSION: '3.16'
44+
# Workflow name for internal logic
45+
WORKFLOW: main
46+
# Docker image Repo and Image name
47+
REPO_NAME: postgis
48+
IMAGE_NAME: postgis
49+
# Docker image version and variant
4250
VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}
4351
VARIANT: ${{ matrix.variant }}
44-
WORKFLOW: main
45-
# NO Docker image tag postfix!
52+
# Docker image tag postfix! in this case, no postfix!
4653
TAG_POSTFIX: ''
4754

4855
steps:
4956
- name: Checkout source
5057
uses: actions/checkout@v3
5158

59+
- name: "debug: Inspect the base alpine image postgres:${{ matrix.postgres }}-alpine${{ env.ALPINE_VERSION }} "
60+
if: ${{ env.VARIANT == 'alpine' }}
61+
run: docker pull --platform=${{ matrix.platforms }} postgres:${{ matrix.postgres }}-alpine{{ env.ALPINE_VERSION }} && docker inspect postgres:${{ matrix.postgres }}-alpine{{ env.ALPINE_VERSION }}
62+
5263
- name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }}${{ env.TAG_POSTFIX }}
5364
run: make test
5465

5566
- name: "debug: docker images"
5667
run: docker images
5768

58-
- name: "debug: docker inspect postgis/postgis:${{ env.VERSION }}${{ env.TAG_POSTFIX }}"
69+
- name: "debug: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_POSTFIX }}"
5970
if: ${{ env.VARIANT == 'default' }}
60-
run: docker inspect postgis/postgis:${{ env.VERSION }}${{ env.TAG_POSTFIX }}
71+
run: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_POSTFIX }}
6172

62-
- name: "debug: docker inspect postgis/postgis:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}"
73+
- name: "debug: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}"
6374
if: ${{ env.VARIANT == 'alpine' }}
64-
run: docker inspect postgis/postgis:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}
75+
run: docker inspect ${{ env.REPO_NAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}-${{ env.VARIANT }}${{ env.TAG_POSTFIX }}
6576

6677
- name: Login to dockerhub
6778
uses: docker/login-action@v1

‎update.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ githubrepolink="https://github.com/postgis/docker-postgis/blob/master"
2323
# sort version numbers with highest last (so it goes first in .travis.yml)
2424
IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -V) ); unset IFS
2525

26+
defaultAlpineSuite='3.16'
2627
defaultDebianSuite='bullseye-slim'
2728
declare -A debianSuite=(
2829
# https://github.com/docker-library/postgres/issues/582
@@ -177,7 +178,7 @@ for version in "${versions[@]}"; do
177178
mv "$version/$variant/Dockerfile.alpine.template" "$version/$variant/Dockerfile"
178179
sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$srcVersion"'/g; s/%%POSTGIS_SHA256%%/'"$srcSha256"'/g' "$version/$variant/Dockerfile"
179180

180-
echo "| [postgis/postgis:${version}-${variant}](${dockerhublink}${version}-${variant}) | [Dockerfile](${githubrepolink}/${version}/${variant}/Dockerfile) | alpine:3.16 | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md
181+
echo "| [postgis/postgis:${version}-${variant}](${dockerhublink}${version}-${variant}) | [Dockerfile](${githubrepolink}/${version}/${variant}/Dockerfile) | alpine:${defaultAlpineSuite} | ${postgresVersion} | ${postgisDocSrc} |" >> _dockerlists_${optimized}.md
181182
)
182183
done
183184
done

0 commit comments

Comments
 (0)