|
8 | 8 | if: "!contains(github.event.head_commit.message, '[skip ci]')" |
9 | 9 | strategy: |
10 | 10 | matrix: |
11 | | - image-name: ['lambda', 'lambda2'] |
| 11 | + image-name: ['base', 'base-2'] |
12 | 12 | gdal-version: [2.4, 3.1, 3.2] |
13 | 13 | steps: |
14 | 14 | - uses: actions/checkout@v2 |
|
18 | 18 | username: ${{ secrets.DOCKERHUB_USERNAME }} |
19 | 19 | password: ${{ secrets.DOCKERHUB_TOKEN }} |
20 | 20 |
|
| 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 | + |
21 | 26 | - name: setup Common cache |
22 | 27 | uses: actions/cache@v2 |
23 | 28 | id: common-cache |
@@ -53,22 +58,22 @@ jobs: |
53 | 58 | docker build \ |
54 | 59 | --build-arg IMAGE_VERSION=${{ matrix.image-name }} \ |
55 | 60 | -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 }} . |
57 | 62 | mkdir -p /tmp/docker |
58 | 63 | docker image save \ |
59 | 64 | -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 }} |
61 | 66 |
|
62 | 67 | - name: Run Tests |
63 | 68 | run: | |
64 | 69 | docker run \ |
65 | 70 | -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 }} \ |
67 | 72 | sh -c "cd /local/tests && sh tests.sh" |
68 | 73 |
|
69 | 74 | - name: Push to DockerHub |
70 | 75 | 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 }} |
72 | 77 |
|
73 | 78 | # runtimes: |
74 | 79 | # needs: [build] |
|
0 commit comments