Skip to content

Commit

Permalink
update base images (#269)
Browse files Browse the repository at this point in the history
* update base images

* Revert "remove integration test since dea-notebooks not working on 3.10"

This reverts commit 6541581.

* pin jsonschema version for compatibility

---------

Co-authored-by: Emma Ai <[email protected]>
  • Loading branch information
emmaai and Emma Ai authored Sep 11, 2023
1 parent 7590828 commit 590b282
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 4 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
name: Integration Test

on:
pull_request:
branches:
- develop
paths:
- '.github/workflows/integration-test.yml'
- 'docker/**'

push:
branches:
- develop
paths:
- '.github/workflows/integration-test.yml'
- 'docker/**'

release:
types: [published]

permissions:
id-token: write
contents: read

jobs:
integration-test:
runs-on: ubuntu-latest
steps:
- name: git checkout dea-sandbox
uses: actions/checkout@v3
with:
path: dea-sandbox

- name: git checkout dea-notebooks
uses: actions/checkout@v3
with:
repository: GeoscienceAustralia/dea-notebooks
path: dea-notebooks
ref: stable

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
role-to-assume: arn:aws:iam::538673716275:role/github-actions-role-readonly
aws-region: ap-southeast-2

- name: Copy tide modelling files with the AWS CLI
run: aws s3 sync s3://dea-non-public-data/tide_models/tide_models tide_models

- name: Start docker-compose
run: |
sudo chown -R 1000:100 ./dea-notebooks
cd ./dea-sandbox/integration-testing
CURRENT_UID=1000:100 docker-compose up -d
- name: Set up Datacube and Test
run: |
cd ./dea-sandbox/integration-testing
docker-compose exec -T sandbox ./dea-notebooks/Tests/setup_test_datacube.sh
docker-compose exec -T sandbox ./dea-notebooks/Tests/test_notebooks.sh
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mambaorg/micromamba:git-7545124-jammy as sandbox-conda
FROM mambaorg/micromamba:git-e4f55ab-jammy as sandbox-conda

USER root
COPY env.yaml /conf/
Expand All @@ -16,7 +16,7 @@ ENV CC=/env/bin/x86_64-conda_cos6-linux-gnu-gcc \
RUN micromamba run -p /env pip install --no-cache-dir \
--no-build-isolation -r /conf/requirements.txt

FROM ubuntu:jammy-20220815
FROM ubuntu:jammy-20230816

ARG nb_user=jovyan
ARG nb_uid=1000
Expand Down
4 changes: 2 additions & 2 deletions docker/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies:
- itsdangerous
- Jinja2
- jmespath
- jsonschema
- jsonschema<4.18
- kiwisolver
- lark
- python-lmdb
Expand All @@ -99,6 +99,7 @@ dependencies:
- partd
- Pillow
- PIMS
- poetry
- psutil
- psycopg2
- pyasn1
Expand Down Expand Up @@ -240,7 +241,6 @@ dependencies:
- prompt-toolkit # because of line_profiler/ipython
- nbconvert # because of jupyter_contrib_nbextensions
- nbformat
- nbval
- sidecar
- yapf
- jedi
Expand Down
1 change: 1 addition & 0 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
cognitojwt
nbval
cgal
line-profiler
jupyterlab-logout
Expand Down

0 comments on commit 590b282

Please sign in to comment.