Skip to content

Commit

Permalink
Merge branch 'master' into pv/refactor-parameterize
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Varner committed Nov 28, 2023
2 parents 9520774 + 67d995c commit 0f9b4fa
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,32 @@ jobs:
--rm ghcr.io/${{ github.repository_owner }}/lambda-gdal:${{ matrix.gdal-version }} \
/local/tests/tests.sh
# Publish
deploy:
needs: [build]
runs-on: ubuntu-latest
if: contains(github.ref, 'tags') && github.event_name == 'push'
steps:
- uses: actions/checkout@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Github
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
if: github.ref == 'refs/heads/master'
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- name: Publish docker image
uses: docker/build-push-action@v5
if: github.ref == 'refs/heads/master'
with:
platforms: linux/amd64
context: .
Expand All @@ -89,7 +103,6 @@ jobs:
tags: ghcr.io/${{ github.repository_owner }}/lambda-gdal:${{ matrix.gdal-version }}

- name: Build and Deploy layers
if: github.ref == 'refs/heads/master'
run: |
docker run \
--platform=linux/amd64 \
Expand All @@ -100,7 +113,6 @@ jobs:
python scripts/deploy.py ${{ matrix.gdal-version }} --deploy
- name: Build Runtime and Push
if: github.ref == 'refs/heads/master'
run: |
runtimes='3.9 3.10 3.11'
for runtime in ${runtimes}; do
Expand All @@ -114,9 +126,8 @@ jobs:
done
update-layer:
needs: [build]
needs: [deploy]
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v4

Expand Down
12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

## Next

- add `yum update` and `yum clean all` to base image (https://github.com/lambgeo/docker-lambda/pull/64)


## 2023-10-23

- update Python 3.11 base image (https://github.com/lambgeo/docker-lambda/pull/60)



0 comments on commit 0f9b4fa

Please sign in to comment.