Skip to content

Commit 9800d80

Browse files
committed
fix
1 parent 4c8d455 commit 9800d80

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
if: "!contains(github.event.head_commit.message, '[skip ci]')"
99
strategy:
1010
matrix:
11-
image-name: ['lambda', 'lambda2']
11+
image-name: ['base', 'base-2']
1212
gdal-version: [2.4, 3.1, 3.2]
1313
steps:
1414
- uses: actions/checkout@v2
@@ -18,6 +18,11 @@ jobs:
1818
username: ${{ secrets.DOCKERHUB_USERNAME }}
1919
password: ${{ secrets.DOCKERHUB_TOKEN }}
2020

21+
- name: set amazonlinux version
22+
id: amazonlinux
23+
run: echo "::set-output name=version::$(echo ${{ matrix.image-name }} | sed -E 's/base(-)?//g' )"
24+
shell: bash
25+
2126
- name: setup Common cache
2227
uses: actions/cache@v2
2328
id: common-cache
@@ -53,22 +58,22 @@ jobs:
5358
docker build \
5459
--build-arg IMAGE_VERSION=${{ matrix.image-name }} \
5560
-f gdal${{ matrix.gdal-version }}/Dockerfile \
56-
-t lambgeo/${{ matrix.image-name }}-gdal:${{ matrix.gdal-version }} .
61+
-t lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }} .
5762
mkdir -p /tmp/docker
5863
docker image save \
5964
-o /tmp/docker/${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar \
60-
lambgeo/${{ matrix.image-name }}-gdal:${{ matrix.gdal-version }}
65+
lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }}
6166
6267
- name: Run Tests
6368
run: |
6469
docker run \
6570
-v ${{ github.workspace }}:/local --rm \
66-
lambgeo/${{ matrix.image-name }}-gdal:${{ matrix.gdal-version }} \
71+
lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }} \
6772
sh -c "cd /local/tests && sh tests.sh"
6873
6974
- name: Push to DockerHub
7075
if: contains(github.ref, 'tags')
71-
run: docker push lambgeo/${{ matrix.image-name }}-gdal:${{ matrix.gdal-version }}
76+
run: docker push lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }}
7277

7378
# runtimes:
7479
# needs: [build]

0 commit comments

Comments
 (0)