From 390daa1f4528dcb78cb995f73c04eabd722025d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 26 Jan 2023 16:34:27 +0100 Subject: [PATCH 01/10] Update Docker action --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 50ff80772..55b3abc7e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,8 +4,8 @@ name: Docker on: # Triggers the workflow on push/tag push: - branches: [ main ] - tags: [ 'v*' ] + #branches: [ main ] + #tags: [ 'v*' ] env: IMAGE: asogaard/graphnet @@ -13,7 +13,7 @@ env: jobs: docker: name: Build and publish - if: github.repository == 'graphnet-team/graphnet' + #if: github.repository == 'graphnet-team/graphnet' runs-on: ubuntu-latest permissions: packages: write @@ -46,6 +46,6 @@ jobs: uses: docker/build-push-action@v3 with: context: "{{ defaultContext }}:docker" - push: true + push: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file From 8d8455aa5e390763d5e8fd4693103756782a6810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 26 Jan 2023 16:40:25 +0100 Subject: [PATCH 02/10] Debug --- docker/dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/dockerfile b/docker/dockerfile index e54109b5f..4d8899e31 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -21,6 +21,8 @@ RUN pip install --upgrade pip && \ pip install --ignore-installed PyYAML # Copy checked out package code to appropriate destination in image. +RUN pwd +RUN ls -lart WORKDIR /root/graphnet ADD . /root/graphnet/ From ade7ac093ea8736082bee62a2d060811f8e1efe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 26 Jan 2023 16:50:23 +0100 Subject: [PATCH 03/10] Update Dockerfile --- docker/dockerfile | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index 4d8899e31..0dcbff349 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -20,15 +20,11 @@ RUN pip install --upgrade pip && \ pip install --upgrade astropy && \ pip install --ignore-installed PyYAML -# Copy checked out package code to appropriate destination in image. -RUN pwd -RUN ls -lart -WORKDIR /root/graphnet -ADD . /root/graphnet/ - # Install GraphNeT and required dependencies. -RUN pip install -r requirements/torch_${HARDWARE}.txt -RUN pip install -e .[develop,torch] +RUN pip install -r https://raw.githubusercontent.com/com/graphnet-team/graphnet/main/requirements/torch_${HARDWARE}.txt +RUN pip install -e git+https://github.com/icecube/graphnet.git#egg=graphnet[develop,torch] + +WORKDIR /root/src/graphnet/ # Create missing alias(es) in slim. RUN echo 'alias python="python3"' >> ~/.bashrc @@ -37,8 +33,5 @@ RUN echo 'alias python="python3"' >> ~/.bashrc RUN echo 'PS1="🐳 \[\033[38;2;86;138;242m\]graphnet@\h \[\033[0m\]❯ \[\033[0;34m\]\w \[\033[0m\]\$ "' >> ~/.bashrc RUN echo 'PS2="\[\033[38;5;236m\]❯\[\033[38;5;239m\]❯\[\033[0m\]❯ "' >> ~/.bashrc -# Enable colours in terminal. -#ENV TERM xterm-256color - # Default command for executing container. CMD [ "/bin/bash" ] \ No newline at end of file From 18219db582ef942dad7a2c2b6b3e00d8170eebf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 26 Jan 2023 19:29:13 +0100 Subject: [PATCH 04/10] Update Dockerfile --- docker/dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index 0dcbff349..d9edbaf5e 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -21,10 +21,11 @@ RUN pip install --upgrade pip && \ pip install --ignore-installed PyYAML # Install GraphNeT and required dependencies. -RUN pip install -r https://raw.githubusercontent.com/com/graphnet-team/graphnet/main/requirements/torch_${HARDWARE}.txt -RUN pip install -e git+https://github.com/icecube/graphnet.git#egg=graphnet[develop,torch] +#RUN pip install -r https://raw.githubusercontent.com/com/graphnet-team/graphnet/main/requirements/torch_${HARDWARE}.txt +#RUN pip install -e git+https://github.com/icecube/graphnet.git#egg=graphnet[develop,torch] -WORKDIR /root/src/graphnet/ +ADD ./graphnet /root/ +WORKDIR /root/graphnet/ # Create missing alias(es) in slim. RUN echo 'alias python="python3"' >> ~/.bashrc From b78dfbff4569e3dab912f1d707c3ad1fcc5c023a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Thu, 26 Jan 2023 19:49:04 +0100 Subject: [PATCH 05/10] Update Dockerfile --- docker/dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/dockerfile b/docker/dockerfile index d9edbaf5e..7ea694a03 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -24,7 +24,10 @@ RUN pip install --upgrade pip && \ #RUN pip install -r https://raw.githubusercontent.com/com/graphnet-team/graphnet/main/requirements/torch_${HARDWARE}.txt #RUN pip install -e git+https://github.com/icecube/graphnet.git#egg=graphnet[develop,torch] -ADD ./graphnet /root/ +ADD . /root/ +WORKDIR /root/ +RUN pwd +RUN ls -lart . WORKDIR /root/graphnet/ # Create missing alias(es) in slim. From bd3d8e707e00580ef3ae159b346074998e4e8acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Fri, 27 Jan 2023 06:49:47 +0100 Subject: [PATCH 06/10] Update Dockerfile --- docker/dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index 7ea694a03..a0eaeb979 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -21,14 +21,17 @@ RUN pip install --upgrade pip && \ pip install --ignore-installed PyYAML # Install GraphNeT and required dependencies. +# -- Via pip #RUN pip install -r https://raw.githubusercontent.com/com/graphnet-team/graphnet/main/requirements/torch_${HARDWARE}.txt #RUN pip install -e git+https://github.com/icecube/graphnet.git#egg=graphnet[develop,torch] -ADD . /root/ -WORKDIR /root/ +# -- Using current source +WORKDIR /root/graphnet/ +ADD ../ /root/graphnet RUN pwd RUN ls -lart . -WORKDIR /root/graphnet/ +RUN pip install -r requirements/torch_${HARDWARE}.txt +RUN pip install -e .[develop,torch] # Create missing alias(es) in slim. RUN echo 'alias python="python3"' >> ~/.bashrc From c7992c40b8abff59b3ccb9a458436ad45e68610f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Fri, 27 Jan 2023 07:12:24 +0100 Subject: [PATCH 07/10] Update Dockerfile --- docker/dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/dockerfile b/docker/dockerfile index a0eaeb979..2ae29ef65 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -27,9 +27,15 @@ RUN pip install --upgrade pip && \ # -- Using current source WORKDIR /root/graphnet/ -ADD ../ /root/graphnet RUN pwd RUN ls -lart . +ADD ./ /root/graphnet/ +RUN ls -lart . +ADD ../ /root/graphnet/ +RUN ls -lart . +ADD ../* /root/graphnet/ +RUN ls -lart . + RUN pip install -r requirements/torch_${HARDWARE}.txt RUN pip install -e .[develop,torch] From 7f1d81b39909c8de353fa8df06f52aec321eff2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Fri, 27 Jan 2023 07:34:39 +0100 Subject: [PATCH 08/10] Update Dockerfile --- .github/workflows/docker.yml | 3 ++- docker/dockerfile => dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) rename docker/dockerfile => dockerfile (93%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 55b3abc7e..b730c8fa8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v3 with: - context: "{{ defaultContext }}:docker" + #context: "{{ defaultContext }}:docker" + context: "{{ defaultContext }}" push: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/docker/dockerfile b/dockerfile similarity index 93% rename from docker/dockerfile rename to dockerfile index 2ae29ef65..68076380d 100644 --- a/docker/dockerfile +++ b/dockerfile @@ -29,12 +29,12 @@ RUN pip install --upgrade pip && \ WORKDIR /root/graphnet/ RUN pwd RUN ls -lart . -ADD ./ /root/graphnet/ -RUN ls -lart . -ADD ../ /root/graphnet/ -RUN ls -lart . -ADD ../* /root/graphnet/ +ADD . /root/graphnet/ RUN ls -lart . +#ADD ../ /root/graphnet/ +#RUN ls -lart . +#ADD ../* /root/graphnet/ +#RUN ls -lart . RUN pip install -r requirements/torch_${HARDWARE}.txt RUN pip install -e .[develop,torch] From 77a202381c3cf0635c30dba0a6d97ad8ccc55845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Fri, 27 Jan 2023 19:52:40 +0100 Subject: [PATCH 09/10] Clean-up --- .github/workflows/docker.yml | 1 - dockerfile | 7 ------- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b730c8fa8..3f76af25f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,6 @@ jobs: - name: Build and push uses: docker/build-push-action@v3 with: - #context: "{{ defaultContext }}:docker" context: "{{ defaultContext }}" push: false tags: ${{ steps.meta.outputs.tags }} diff --git a/dockerfile b/dockerfile index 68076380d..8749b1695 100644 --- a/dockerfile +++ b/dockerfile @@ -27,14 +27,7 @@ RUN pip install --upgrade pip && \ # -- Using current source WORKDIR /root/graphnet/ -RUN pwd -RUN ls -lart . ADD . /root/graphnet/ -RUN ls -lart . -#ADD ../ /root/graphnet/ -#RUN ls -lart . -#ADD ../* /root/graphnet/ -#RUN ls -lart . RUN pip install -r requirements/torch_${HARDWARE}.txt RUN pip install -e .[develop,torch] From 24b305b6ac6147d5eca0c37418313cc6ad7d16db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=B8gaard?= Date: Fri, 27 Jan 2023 19:54:26 +0100 Subject: [PATCH 10/10] Clean-up --- .github/workflows/docker.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3f76af25f..7d5ad7964 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,8 +4,8 @@ name: Docker on: # Triggers the workflow on push/tag push: - #branches: [ main ] - #tags: [ 'v*' ] + branches: [ main ] + tags: [ 'v*' ] env: IMAGE: asogaard/graphnet @@ -13,7 +13,7 @@ env: jobs: docker: name: Build and publish - #if: github.repository == 'graphnet-team/graphnet' + if: github.repository == 'graphnet-team/graphnet' runs-on: ubuntu-latest permissions: packages: write @@ -45,7 +45,6 @@ jobs: - name: Build and push uses: docker/build-push-action@v3 with: - context: "{{ defaultContext }}" - push: false + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file