fix

Author: vincentsarago

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
       - name: set amazonlinux version
         id: amazonlinux
-        run: echo "::set-output name=version::$(echo ${{ matrix.image-name }} | sed -E 's/base(-)?//g' )"
+        run: echo "::set-output name=version::$(if [ '${{ matrix.image-name }}' == 'base-2' ]; then echo '-al2'; else echo ''; fi)"
         shell: bash
 
       - name: setup Common cache
@@ -58,27 +58,27 @@ jobs:
           docker build \
             --build-arg IMAGE_VERSION=${{ matrix.image-name }} \
             -f gdal${{ matrix.gdal-version }}/Dockerfile \
-            -t lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }} .
+            -t lambgeo/lambda-gdal:${{ matrix.gdal-version }}${{ steps.amazonlinux.outputs.version }} .
           mkdir -p /tmp/docker
           docker image save \
             -o /tmp/docker/${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar \
-            lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }}
+            lambgeo/lambda-gdal:${{ matrix.gdal-version }}${{ steps.amazonlinux.outputs.version }}
 
       - name: Run Tests
         run: |
           docker run \
             -v ${{ github.workspace }}:/local --rm \
-            lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }} \
+            lambgeo/lambda-gdal:${{ matrix.gdal-version }}${{ steps.amazonlinux.outputs.version }} \
             sh -c "cd /local/tests && sh tests.sh"
 
       - name: Push to DockerHub
         if: github.ref == 'refs/heads/master'
-        run: docker push lambgeo/lambda${{ steps.amazonlinux.outputs.version }}-gdal:${{ matrix.gdal-version }}
+        run: docker push lambgeo/lambda-gdal:${{ matrix.gdal-version }}${{ steps.amazonlinux.outputs.version }}
 
       - name: Build Runtime and Push to DockerHub
         if: github.ref == 'refs/heads/master'
         run: |
-          runtimes=$(if [ '${{ steps.amazonlinux.outputs.version }}' == '2' ]; then echo 'python3.8'; else echo 'python3.7'; fi)
+          runtimes=$(if [ '${{ steps.amazonlinux.outputs.version }}' == '-al2' ]; then echo 'python3.8'; else echo 'python3.7'; fi)
           for runtime in ${runtimes}; do
             docker build \
               --build-arg GDAL_VERSION=${{ matrix.gdal-version }} \

README.md

@@ -33,13 +33,13 @@ Based on lambci/lambda-base:build (amazonlinux)
 
 Based on lambci/lambda-base-2:build (amazonlinux2) for newer runtimes (e.g python 3.8)
   - GDAL 3.2.0 (Oct. 2020)
-    - **lambgeo/lambda2-gdal:3.2**
+    - **lambgeo/lambda-gdal:3.2-al2**
 
   - GDAL 3.1.4 (Oct. 2020)
-    - **lambgeo/lambda2-gdal:3.1**
+    - **lambgeo/lambda-gdal:3.1-al2**
 
   - GDAL 2.4.4 (June 2020)
-    - **lambgeo/lambda2-gdal:2.4**
+    - **lambgeo/lambda-gdal:2.4-al2**
 
   - For python 3.8
     - **lambgeo/lambda-gdal:3.2-python3.8**

runtimes/python3.8

@@ -1,6 +1,6 @@
 ARG GDAL_VERSION
 
-FROM lambgeo/lambda2-gdal:${GDAL_VERSION} as gdal
+FROM lambgeo/lambda-gdal:${GDAL_VERSION}-al2 as gdal
 
 FROM lambci/lambda:build-python3.8