From 526df139b103ef93ae32b53089659e98b4406afc Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Mon, 11 Dec 2023 19:37:18 +0000 Subject: [PATCH] Update Dockerfile and launch configurations --- .github/workflows/release.yml | 42 ------------------- .vscode/launch.json | 14 ------- CommonServer/EnvironmentConfig.ts | 6 --- .../Public/oneuptime/templates/_helpers.tpl | 2 - HelmChart/Public/oneuptime/values.yaml | 1 - Tests/Scripts/status-check.sh | 2 - config.example.env | 1 - docker-compose.base.yml | 1 - 8 files changed, 69 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7be7c43f2..43ccee1c46 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -329,48 +329,6 @@ jobs: GIT_SHA=${{ github.sha }} APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}} - - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - uses: actions/setup-node@v2 - with: - node-version: 18.3.0 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Generate Dockerfile from Dockerfile.tpl - run: npm run prerun - - - name: Login to Docker Hub - uses: docker/login-action@v2.2.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2.2.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - file: ./LinkShortener/Dockerfile - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - GIT_SHA=${{ github.sha }} - APP_VERSION=7.0.${{needs.generate-build-number.outputs.build_number}} workers-docker-image-deploy: needs: generate-build-number diff --git a/.vscode/launch.json b/.vscode/launch.json index 4820f4d5f5..98ad45e6f9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -55,20 +55,6 @@ "restart": true, "autoAttachChildProcesses": true }, - { - "address": "127.0.0.1", - "localRoot": "${workspaceFolder}/LinkShortener", - "name": "Link Shortener: Debug with Docker", - "port": 9826, - "remoteRoot": "/usr/src/app", - "request": "attach", - "skipFiles": [ - "/**" - ], - "type": "node", - "restart": true, - "autoAttachChildProcesses": true - }, { "address": "127.0.0.1", "localRoot": "${workspaceFolder}/TestServer", diff --git a/CommonServer/EnvironmentConfig.ts b/CommonServer/EnvironmentConfig.ts index 6b8a7990b0..250b7fce7a 100644 --- a/CommonServer/EnvironmentConfig.ts +++ b/CommonServer/EnvironmentConfig.ts @@ -79,12 +79,6 @@ export const WorkerHostname: Hostname = Hostname.fromString( }` ); -export const LinkShortenerHostname: Hostname = Hostname.fromString( - `${process.env['SERVER_LINK_SHORTENER_HOSTNAME' || 'localhost']}:${ - process.env['LINK_SHORTENER_PORT'] || 80 - }` -); - export const WorkflowHostname: Hostname = Hostname.fromString( `${process.env['SERVER_WORKFLOW_HOSTNAME'] || 'localhost'}:${ process.env['WORKFLOW_PORT'] || 80 diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index 74e5964108..875076aaa4 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -60,8 +60,6 @@ value: {{ $.Values.port.apiReference | squote }} - name: WORKFLOW_PORT value: {{ $.Values.port.workflow | squote }} -- name: LINK_SHORTENER_PORT - value: {{ $.Values.port.linkShortener | squote }} - name: ALERT_PORT value: {{ $.Values.port.alert | squote }} - name: INGESTOR_PORT diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml index cc47c5c22b..ec00736f70 100644 --- a/HelmChart/Public/oneuptime/values.yaml +++ b/HelmChart/Public/oneuptime/values.yaml @@ -134,7 +134,6 @@ port: dashboardApi: 3002 apiReference: 1445 workflow: 3099 - linkShortener: 3521 alert: 3088 ingestor: 3400 testServer: 3800 diff --git a/Tests/Scripts/status-check.sh b/Tests/Scripts/status-check.sh index b0acc7aae0..1f63ba39f7 100644 --- a/Tests/Scripts/status-check.sh +++ b/Tests/Scripts/status-check.sh @@ -38,8 +38,6 @@ bash $scriptDir/endpoint-status.sh "Workflow" $HOST_TO_CHECK/workflow/status bash $scriptDir/endpoint-status.sh "API Docs" $HOST_TO_CHECK/reference/status -bash $scriptDir/endpoint-status.sh "Link Shortener" $HOST_TO_CHECK/l/status - bash $scriptDir/endpoint-status.sh "Admin Dashboard" $HOST_TO_CHECK/admin/status bash $scriptDir/endpoint-status.sh "Ingestor" $HOST_TO_CHECK/ingestor/status diff --git a/config.example.env b/config.example.env index 71d54eea87..1dc03e9853 100644 --- a/config.example.env +++ b/config.example.env @@ -97,7 +97,6 @@ OTEL_COLLECTOR_HOSTNAME=otel-collector DASHBOARD_API_PORT=3002 API_REFERENCE_PORT=1445 WORKFLOW_PORT=3099 -LINK_SHORTENER_PORT=3521 ALERT_PORT=3088 INGESTOR_PORT=3400 PROBE_PORT=3500 diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 948a917d57..3219e58072 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -39,7 +39,6 @@ x-common-variables: &common-variables DASHBOARD_API_PORT: ${DASHBOARD_API_PORT} API_REFERENCE_PORT: ${API_REFERENCE_PORT} WORKFLOW_PORT: ${WORKFLOW_PORT} - LINK_SHORTENER_PORT: ${LINK_SHORTENER_PORT} ALERT_PORT: ${ALERT_PORT} INGESTOR_PORT: ${INGESTOR_PORT} PROBE_PORT: ${PROBE_PORT}