kopia lustrzana https://github.com/kartoza/docker-postgis
Allow setting image owner
rodzic
6ecfb52d98
commit
879099acc4
|
@ -80,6 +80,7 @@ jobs:
|
||||||
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
|
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
|
||||||
build-args: |
|
build-args: |
|
||||||
DISTRO=${{ matrix.distro }}
|
DISTRO=${{ matrix.distro }}
|
||||||
|
IMAGE_OWNER=${{ secrets.DOCKERHUB_REPO }}
|
||||||
IMAGE_VERSION=${{ matrix.imageVersion }}
|
IMAGE_VERSION=${{ matrix.imageVersion }}
|
||||||
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
||||||
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
||||||
|
@ -131,9 +132,10 @@ jobs:
|
||||||
file: Dockerfile
|
file: Dockerfile
|
||||||
push: false
|
push: false
|
||||||
load: true
|
load: true
|
||||||
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:manual-build
|
tags: kartoza/postgis:manual-build
|
||||||
build-args: |
|
build-args: |
|
||||||
DISTRO=${{ matrix.distro }}
|
DISTRO=${{ matrix.distro }}
|
||||||
|
IMAGE_OWNER=kartoza
|
||||||
IMAGE_VERSION=${{ matrix.imageVersion }}
|
IMAGE_VERSION=${{ matrix.imageVersion }}
|
||||||
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
||||||
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
||||||
|
@ -148,7 +150,7 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
file: Dockerfile.test
|
file: Dockerfile.test
|
||||||
push: false
|
push: false
|
||||||
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:manual-build
|
tags: kartoza/postgis:manual-build
|
||||||
load: true
|
load: true
|
||||||
- name: Run scenario test
|
- name: Run scenario test
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -84,6 +84,7 @@ jobs:
|
||||||
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
|
tags: ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
|
||||||
build-args: |
|
build-args: |
|
||||||
DISTRO=${{ matrix.distro }}
|
DISTRO=${{ matrix.distro }}
|
||||||
|
IMAGE_OWNER=${{ secrets.DOCKERHUB_REPO }}
|
||||||
IMAGE_VERSION=${{ matrix.imageVersion }}
|
IMAGE_VERSION=${{ matrix.imageVersion }}
|
||||||
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
IMAGE_VARIANT=${{ matrix.imageVariant }}
|
||||||
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
|
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
|
||||||
ARG DISTRO=debian
|
ARG DISTRO=debian
|
||||||
|
ARG IMAGE_OWNER=kartoza
|
||||||
ARG IMAGE_VERSION=bullseye
|
ARG IMAGE_VERSION=bullseye
|
||||||
ARG IMAGE_VARIANT=slim
|
ARG IMAGE_VARIANT=slim
|
||||||
FROM kartoza/postgis:base-$DISTRO-$IMAGE_VERSION-$IMAGE_VARIANT
|
FROM $IMAGE_OWNER/postgis:base-$DISTRO-$IMAGE_VERSION-$IMAGE_VARIANT
|
||||||
|
|
||||||
MAINTAINER Tim Sutton<tim@kartoza.com>
|
MAINTAINER Tim Sutton<tim@kartoza.com>
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue