diff options
| author | vincent van beek <vincent@vlogic.nl> | 2026-03-30 15:31:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-30 14:31:58 +0100 |
| commit | 0ae172363b8d9544b3cad15cfcb6733f2c814afb (patch) | |
| tree | 72bacbe8769e9ce3d5b3db77fa7ed41ab2d78d09 | |
| parent | 048bf777997bdbf599240645fc66612c98abf3c2 (diff) | |
attempt to fix the deploy of the new UI setup (#394)
| -rw-r--r-- | .github/workflows/deploy.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/publish.yml | 27 | ||||
| -rw-r--r-- | docker-compose.prod.yml | 9 |
3 files changed, 3 insertions, 35 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 139bb7ba..215bbbf4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,6 +21,6 @@ jobs: - name: Pull Changes run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && git pull origin' - name: Rebuild Images - run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && sudo docker-compose -f docker-compose.yml -f docker-compose.prod.yml build frontend api simulator' + run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && sudo docker-compose -f docker-compose.yml -f docker-compose.prod.yml build api simulator' - name: Deploy Images run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && sudo docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 294be1d1..d076dc87 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -57,33 +57,6 @@ jobs: push: true file: opendc-web/opendc-web-server/Dockerfile tags: ${{ steps.prep.outputs.tags }} - push-ui: - name: Push UI to DockerHub - runs-on: ubuntu-22.04 - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=ghcr.io/atlarge-research/opendc-web-ui - VERSION=3.0-SNAPSHOT - if [[ $GITHUB_REF == refs/tags/v* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - fi - echo "tags=${DOCKER_IMAGE}:${VERSION}" >> $GITHUB_OUTPUT - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Push to Docker Hub - uses: docker/build-push-action@v6 - with: - push: true - context: opendc-web/opendc-web-ui - tags: ${{ steps.prep.outputs.tags }} publish-maven-central: name: Publish to Maven Central runs-on: ubuntu-latest diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 58d5ce55..f757c481 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -2,14 +2,9 @@ version: "3.8" # Docker Compose overrides for production environments services: - ui: - ports: - - "8080:3000" - environment: - NEXT_PUBLIC_API_BASE_URL: ${OPENDC_API_BASE_URL} - server: ports: - - "8081:8080" + - "8080:8080" environment: SENTRY_ENVIRONMENT: "production" + NEXT_PUBLIC_API_BASE_URL: ${OPENDC_API_BASE_URL} |