From f90f0f5156817b939f0bb6d3638a527ca17235e5 Mon Sep 17 00:00:00 2001 From: Rui Campos Date: Sat, 29 Apr 2023 17:13:23 +0100 Subject: [PATCH] Update and rename docker-publish-manual.yml to docker-publish.yml (#63) * Update and rename docker-publish-manual.yml to docker-publish.yml * Create docker-compose.override.yml * Update docker-compose.yml * Update docker-compose.yml * Update docker-publish.yml --- .../{docker-publish-manual.yml => docker-publish.yml} | 3 +-- docker-compose.override.yml | 4 ++++ docker-compose.yml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) rename .github/workflows/{docker-publish-manual.yml => docker-publish.yml} (94%) create mode 100644 docker-compose.override.yml diff --git a/.github/workflows/docker-publish-manual.yml b/.github/workflows/docker-publish.yml similarity index 94% rename from .github/workflows/docker-publish-manual.yml rename to .github/workflows/docker-publish.yml index b6561a4d..8901eead 100644 --- a/.github/workflows/docker-publish-manual.yml +++ b/.github/workflows/docker-publish.yml @@ -1,4 +1,4 @@ -name: Buld and Publish Image (Manual Trigger) +name: Buld and Publish Image on: @@ -34,7 +34,6 @@ jobs: # https://github.com/docker/login-action - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c with: registry: ${{ env.REGISTRY }} diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 00000000..3f888ea2 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,4 @@ + +services: + jupyter-notebook: + build: . diff --git a/docker-compose.yml b/docker-compose.yml index 18378796..9015568b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ services: - jupyter-notebook: - build: . + jupyter-notebook: + image: ghcr.io/ruifilipecampos/montycarlo:${MONTY_VERSION:-dev} command: jupyter notebook --ip='0.0.0.0' --port=${MONTY_JUPYTER_PORT:-8888} --no-browser --allow-root --NotebookApp.token=${MONTY_JUPYTER_TOKEN:-''} ports: - ${MONTY_JUPYTER_PORT:-8888}:8888