Update Dockerfile and launch configurations

This commit is contained in:
Simon Larsen 2023-12-11 19:37:18 +00:00
parent c60eaccc90
commit 526df139b1
No known key found for this signature in database
GPG Key ID: AB45983AA9C81CDE
8 changed files with 0 additions and 69 deletions

View File

@ -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

14
.vscode/launch.json vendored
View File

@ -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": [
"<node_internals>/**"
],
"type": "node",
"restart": true,
"autoAttachChildProcesses": true
},
{
"address": "127.0.0.1",
"localRoot": "${workspaceFolder}/TestServer",

View File

@ -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

View File

@ -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

View File

@ -134,7 +134,6 @@ port:
dashboardApi: 3002
apiReference: 1445
workflow: 3099
linkShortener: 3521
alert: 3088
ingestor: 3400
testServer: 3800

View File

@ -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

View File

@ -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

View File

@ -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}