added basic ubuntu container

lsst-uk · Jul 2, 2024 · 7287883 · 7287883
1 parent 96b0c73
commit 7287883
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/docker-image.yml → .github/workflows/mamba-env.yml b/.github/workflows/docker-image.yml → .github/workflows/mamba-env.yml
@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: mamba env CI
 
 on:
   push:
@@ -15,6 +15,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Build the Docker image
-      run: docker build . --file echo-side/containers/basic_env/Dockerfile --tag ghcr.io/lsst-uk/csd3-echo-somerville:$(git rev-parse --short HEAD) --tag ghcr.io/lsst-uk/csd3-echo-somerville:latest
+      run: docker build . --file echo-side/containers/mamba_env/Dockerfile --tag ghcr.io/lsst-uk/csd3-echo-somerville:$(git rev-parse --short HEAD) --tag ghcr.io/lsst-uk/csd3-echo-somerville:latest
     - name: Push the Docker image
       run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u lsst-uk --password-stdin && docker push --all-tags ghcr.io/lsst-uk/csd3-echo-somerville
diff --git a/.github/workflows/ubuntu-only.yml b/.github/workflows/ubuntu-only.yml
@@ -0,0 +1,20 @@
+name: mamba env CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      run: docker build . --file echo-side/containers/basic_linux/Dockerfile --tag ghcr.io/lsst-uk/csd3-echo-somerville:ubuntu-$(git rev-parse --short HEAD) --tag ghcr.io/lsst-uk/csd3-echo-somerville:ubuntu-latest
+    - name: Push the Docker image
+      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u lsst-uk --password-stdin && docker push --all-tags ghcr.io/lsst-uk/csd3-echo-somerville
diff --git a/echo-side/containers/basic_linux/Dockerfile b/echo-side/containers/basic_linux/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu
+
+LABEL org.opencontainers.image.source https://github.com/lsst-uk/csd3-echo-somerville
+LABEL org.opencontainers.image.description="Code to backup and curate LSST-UK data from CSD3 to Echo."
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+
+RUN apt-get update && apt-get install -y git
+
+RUN git clone https://github.com/lsst-uk/csd3-echo-somerville.git
diff --git a/echo-side/containers/check-csv/Dockerfile b/echo-side/containers/check-csv/Dockerfile
diff --git a/echo-side/containers/check-csv/entrypoint.sh b/echo-side/containers/check-csv/entrypoint.sh
diff --git a/echo-side/containers/basic_env/Dockerfile → echo-side/containers/mamba_env/Dockerfile b/echo-side/containers/basic_env/Dockerfile → echo-side/containers/mamba_env/Dockerfile
diff --git a/echo-side/containers/basic_env/entrypoint.sh → echo-side/containers/mamba_env/entrypoint.sh b/echo-side/containers/basic_env/entrypoint.sh → echo-side/containers/mamba_env/entrypoint.sh
diff --git a/echo-side/dags/cleanup_logs.py b/echo-side/dags/cleanup_logs.py
@@ -30,7 +30,7 @@
 
 clean_up_logs = KubernetesPodOperator(
     task_id='clean_up_logs',
-    image='ghcr.io/lsst-uk/csd3-echo-somerville:latest',
+    image='ghcr.io/lsst-uk/csd3-echo-somerville:ubuntu-latest',
     arguments=['csd3-echo-somerville/scripts/clean_up_logs.sh', '/lsst-backup-logs'],
     dag=dag,
     volumes=[logs_volume],