From ef2fe5277785cf1faeff56266506bfd9646c9c56 Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Fri, 6 Dec 2024 18:55:36 -0800 Subject: [PATCH 1/9] Ensure default development branch, manage submodules separately. Signed-off-by: John Schmidt --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 946a11a..7d36ae7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,10 @@ [submodule "projects/podverse-web"] path = projects/podverse-web url = https://github.com/podverse/podverse-web.git + branch = develop + ignore = all [submodule "projects/podverse-api"] path = projects/podverse-api url = https://github.com/podverse/podverse-api.git + branch = develop + ignore = all From 1c961cb0d4e0876e2477a6df1cc434925d83bac7 Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sat, 7 Dec 2024 20:49:46 -0800 Subject: [PATCH 2/9] feat: add devcontainer config Signed-off-by: John Schmidt --- .devcontainer/docker-compose.yml | 28 +++++++++++ .devcontainer/podverse-api/Dockerfile | 13 ++++++ .devcontainer/podverse-api/devcontainer.json | 49 ++++++++++++++++++++ .devcontainer/podverse-web/Dockerfile | 1 + .devcontainer/podverse-web/devcontainer.json | 47 +++++++++++++++++++ Makefile | 33 +++++++++++++ 6 files changed, 171 insertions(+) create mode 100644 .devcontainer/docker-compose.yml create mode 100644 .devcontainer/podverse-api/Dockerfile create mode 100644 .devcontainer/podverse-api/devcontainer.json create mode 100644 .devcontainer/podverse-web/Dockerfile create mode 100644 .devcontainer/podverse-web/devcontainer.json diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml new file mode 100644 index 0000000..a7a09b9 --- /dev/null +++ b/.devcontainer/docker-compose.yml @@ -0,0 +1,28 @@ +services: + podverse_web: + build: + context: ../../.devcontainer/podverse-web + command: sleep infinity + user: node + volumes: + - type: bind + source: ../.. + target: /workspaces + bind: + selinux: z + create_host_path: false + working_dir: /workspaces/projects/podverse-web + + podverse_api: + build: + context: ../../.devcontainer/podverse-api + command: sleep infinity + user: node + volumes: + - type: bind + source: ../.. + target: /workspaces + bind: + selinux: z + create_host_path: false + working_dir: /workspaces/projects/podverse-api \ No newline at end of file diff --git a/.devcontainer/podverse-api/Dockerfile b/.devcontainer/podverse-api/Dockerfile new file mode 100644 index 0000000..3fad100 --- /dev/null +++ b/.devcontainer/podverse-api/Dockerfile @@ -0,0 +1,13 @@ +FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm + +# Update the package listing, so we know what package exist: +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get -y install --no-install-recommends podman slirp4netns systemd uidmap \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +# Create symbolic link so docker commands are handled as podman commands +RUN ln -s /usr/bin/podman /usr/bin/docker + +RUN adduser --disabled-login --gecos api_user api_user \ No newline at end of file diff --git a/.devcontainer/podverse-api/devcontainer.json b/.devcontainer/podverse-api/devcontainer.json new file mode 100644 index 0000000..558803d --- /dev/null +++ b/.devcontainer/podverse-api/devcontainer.json @@ -0,0 +1,49 @@ +{ + "name": "Podverse API", + "dockerComposeFile": [ + "../../docker-compose/local/docker-compose.yml", + "../docker-compose.yml" + ], + "service": "podverse_api", + "workspaceFolder": "/workspaces/projects/podverse-api", + "features": { + "ghcr.io/devcontainers/features/common-utils": {}, + "ghcr.io/devcontainers-extra/features/prettier": {}, + "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { + "version": "16" + } + }, + "portsAttributes": { + "3000": { + "label": "Podverse Web", + "onAutoForward": "openBrowserOnce" + }, + "1234": { + "label": "Podverse API" + }, + "5432": { + "label": "Podverse Database" + }, + "9306": { + "label": "Manticore" + }, + "9308": { + "label": "Manticore" + } + }, + "runServices": ["podverse_web", "podverse_db", "podverse_manticore"], + // Uncomment the next line if you want to keep your containers running after VS Code shuts down. + // This is needed if you have a multi-container dev environment with frontend and backend. + // You will need to manually shutdown containers when you're done. + "shutdownAction": "none" + + // Uncomment the next line to run commands after the container is created. + // "postCreateCommand": "cat /etc/os-release", + // "onCreateCommand": "make local_git_sub_init" + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "devcontainer" +} diff --git a/.devcontainer/podverse-web/Dockerfile b/.devcontainer/podverse-web/Dockerfile new file mode 100644 index 0000000..9384f96 --- /dev/null +++ b/.devcontainer/podverse-web/Dockerfile @@ -0,0 +1 @@ +FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm \ No newline at end of file diff --git a/.devcontainer/podverse-web/devcontainer.json b/.devcontainer/podverse-web/devcontainer.json new file mode 100644 index 0000000..f9aad43 --- /dev/null +++ b/.devcontainer/podverse-web/devcontainer.json @@ -0,0 +1,47 @@ +{ + "name": "Podverse Web", + "dockerComposeFile": [ + "../../docker-compose/local/docker-compose.yml", + "../docker-compose.yml" + ], + "service": "podverse_web", + "workspaceFolder": "/workspaces/projects/podverse-web", + "features": { + "ghcr.io/devcontainers/features/common-utils": {}, + "ghcr.io/devcontainers-extra/features/prettier": {}, + "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { + "version": "16" + } + }, + "portsAttributes": { + "3000": { + "label": "Podverse Web", + "onAutoForward": "openBrowserOnce" + }, + "1234": { + "label": "Podverse API" + }, + "5432": { + "label": "Podverse Database" + }, + "9306": { + "label": "Manticore" + }, + "9308": { + "label": "Manticore" + } + }, + "runServices": ["podverse_api", "podverse_db", "podverse_manticore"], + + // Uncomment the next line if you want to keep your containers running after VS Code shuts down. + // This is needed if you have a multi-container dev environment with frontend and backend. + // You will need to manually shutdown containers when you're done. + "shutdownAction": "none" + + // Uncomment the next line to run commands after the container is created. + // "postCreateCommand": "cat /etc/os-release", + // "onCreateCommand": "make local_git_sub_init" + + // Configure tool-specific properties. + // "customizations": {}, +} diff --git a/Makefile b/Makefile index 308765f..4415186 100644 --- a/Makefile +++ b/Makefile @@ -322,3 +322,36 @@ sanbox_srv_docker-compose_up: .PHONY: sanbox_srv_docker-compose_up-no_dettach sanbox_srv_docker-compose_up-no_dettach: docker-compose -f docker-compose/sandbox/srv/docker-compose.yml up + +.PHONY: dev_init +dev_init: dev_init_web dev_init_api + +.PHONY: dev_init_web +dev_init_web: + @echo 'Starting devcontainers' + @devcontainer up --workspace-folder . --config .devcontainer/podverse-web/devcontainer.json + +.PHONY: dev_init_api +dev_init_api: + @echo 'Setting up api devcontainer' + @devcontainer set-up --config .devcontainer/podverse-api/devcontainer.json --container-id podverse_api_local + +.PHONY: dev_start_api +dev_start_api: + @echo 'Starting Podverse API node server' + @devcontainer exec --config .devcontainer/podverse-api/devcontainer.json --container-id podverse_api_local yarn start + +.PHONY: dev_start_web +dev_start_web: + @echo 'Starting Podverse Web node server' + @devcontainer exec --config .devcontainer/podverse-web/devcontainer.json --container-id podverse_web_local yarn start + +.PHONY: dev_shell_api +dev_shell_api: + @echo 'Shelling into api container' + @devcontainer exec --config .devcontainer/podverse-api/devcontainer.json --container-id podverse_api_local bash + +.PHONY: dev_shell_web +dev_shell_web: + @echo 'Shelling into web container' + @devcontainer exec --config .devcontainer/podverse-web/devcontainer.json --container-id podverse_web_local bash From 23e2c168ea047a34820f612046ae20ba284df3c9 Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sat, 7 Dec 2024 20:50:51 -0800 Subject: [PATCH 3/9] chore: update to match prod postgres version Signed-off-by: John Schmidt --- db/old-sample-database/Dockerfile | 2 +- db/qa-database/Dockerfile | 2 +- db/schema-only/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/old-sample-database/Dockerfile b/db/old-sample-database/Dockerfile index 7ffdbae..88e4a04 100644 --- a/db/old-sample-database/Dockerfile +++ b/db/old-sample-database/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:11.5 +FROM postgres:16.2-bookworm ADD ./old-sample-database.sql.gz /docker-entrypoint-initdb.d diff --git a/db/qa-database/Dockerfile b/db/qa-database/Dockerfile index 8e0c0dd..9861c9d 100644 --- a/db/qa-database/Dockerfile +++ b/db/qa-database/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:11.5 +FROM postgres:16.2-bookworm ADD ./qa-database.sql.gz /docker-entrypoint-initdb.d diff --git a/db/schema-only/Dockerfile b/db/schema-only/Dockerfile index eb1a207..380ba62 100644 --- a/db/schema-only/Dockerfile +++ b/db/schema-only/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:11.5 +FROM postgres:16.2-bookworm ADD ./schema-only.sql.gz /docker-entrypoint-initdb.d From 771ff7e6309aa93163ac96ab1368e44eadefd39e Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sat, 7 Dec 2024 20:56:25 -0800 Subject: [PATCH 4/9] fix: paths to submodules were not working for devcontainer Signed-off-by: John Schmidt --- docker-compose/local/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose/local/docker-compose.yml b/docker-compose/local/docker-compose.yml index 582d821..353a557 100644 --- a/docker-compose/local/docker-compose.yml +++ b/docker-compose/local/docker-compose.yml @@ -81,7 +81,7 @@ services: max-size: '50m' podverse_api: - build: ./projects/podverse-api + build: ../projects/podverse-api container_name: podverse_api_local privileged: true depends_on: @@ -104,7 +104,7 @@ services: max-size: "50m" podverse_web: - build: ./projects/podverse-web + build: ../projects/podverse-web container_name: podverse_web_local depends_on: # - podverse_nginx_proxy @@ -125,7 +125,7 @@ services: max-size: "50m" podverse_api_worker: - build: ./projects/podverse-api + build: ../projects/podverse-api container_name: podverse_api_worker_local env_file: - ../../config/podverse-api-local.env @@ -136,7 +136,7 @@ services: max-size: "50m" podverse_maintenance_mode_web: - build: ./projects/podverse-web/maintenance_mode + build: ../projects/podverse-web/maintenance_mode container_name: podverse_maintenance_mode_web_local # depends_on: # - podverse_nginx_proxy From a5d1c6308f344486a8567b1ddb6b89fd65b4471e Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sat, 7 Dec 2024 22:37:30 -0800 Subject: [PATCH 5/9] formatting Signed-off-by: John Schmidt --- .devcontainer/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index a7a09b9..4707c18 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -25,4 +25,5 @@ services: bind: selinux: z create_host_path: false - working_dir: /workspaces/projects/podverse-api \ No newline at end of file + working_dir: /workspaces/projects/podverse-api + From 64c4be037af0feda3563f0175d23b33ca9e79692 Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sat, 7 Dec 2024 23:02:41 -0800 Subject: [PATCH 6/9] chore: update database to match prod Signed-off-by: John Schmidt --- db/old-sample-database/Dockerfile | 2 +- db/qa-database/Dockerfile | 2 +- db/schema-only/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/old-sample-database/Dockerfile b/db/old-sample-database/Dockerfile index 88e4a04..d05540d 100644 --- a/db/old-sample-database/Dockerfile +++ b/db/old-sample-database/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:16.2-bookworm +FROM postgres:16.5-bookworm ADD ./old-sample-database.sql.gz /docker-entrypoint-initdb.d diff --git a/db/qa-database/Dockerfile b/db/qa-database/Dockerfile index 9861c9d..297c7b3 100644 --- a/db/qa-database/Dockerfile +++ b/db/qa-database/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:16.2-bookworm +FROM postgres:16.5-bookworm ADD ./qa-database.sql.gz /docker-entrypoint-initdb.d diff --git a/db/schema-only/Dockerfile b/db/schema-only/Dockerfile index 380ba62..398d7b5 100644 --- a/db/schema-only/Dockerfile +++ b/db/schema-only/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres:16.2-bookworm +FROM postgres:16.5-bookworm ADD ./schema-only.sql.gz /docker-entrypoint-initdb.d From 58aa11e53caf20cce764ecf308ef74db464f041e Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sun, 8 Dec 2024 21:32:11 -0800 Subject: [PATCH 7/9] feat: add prebuild github action Signed-off-by: John Schmidt --- .devcontainer/docker-compose.yml | 9 ++-- .devcontainer/podverse-web/Dockerfile | 1 - .../.devcontainer}/podverse-api/Dockerfile | 9 +++- .../podverse-api/devcontainer.json | 14 +++++++ .github/.devcontainer/podverse-web/Dockerfile | 5 +++ .../podverse-web/devcontainer.json | 14 +++++++ .github/dependabot.yml | 12 ++++++ .../workflows/devcontainer-build-and-push.yml | 41 +++++++++++++++++++ 8 files changed, 100 insertions(+), 5 deletions(-) delete mode 100644 .devcontainer/podverse-web/Dockerfile rename {.devcontainer => .github/.devcontainer}/podverse-api/Dockerfile (52%) create mode 100644 .github/.devcontainer/podverse-api/devcontainer.json create mode 100644 .github/.devcontainer/podverse-web/Dockerfile create mode 100644 .github/.devcontainer/podverse-web/devcontainer.json create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/devcontainer-build-and-push.yml diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4707c18..b38483a 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,7 +1,9 @@ services: podverse_web: + # TODO uncomment image before merging + # image: ghcr.io/podverse/podverse-web-dev build: - context: ../../.devcontainer/podverse-web + context: ../../.github/.devcontainer/podverse-web/ command: sleep infinity user: node volumes: @@ -14,8 +16,10 @@ services: working_dir: /workspaces/projects/podverse-web podverse_api: + # TODO uncomment image before merging + # image: ghcr.io/podverse/podverse-api-dev build: - context: ../../.devcontainer/podverse-api + context: ../../.github/.devcontainer/podverse-api/ command: sleep infinity user: node volumes: @@ -26,4 +30,3 @@ services: selinux: z create_host_path: false working_dir: /workspaces/projects/podverse-api - diff --git a/.devcontainer/podverse-web/Dockerfile b/.devcontainer/podverse-web/Dockerfile deleted file mode 100644 index 9384f96..0000000 --- a/.devcontainer/podverse-web/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm \ No newline at end of file diff --git a/.devcontainer/podverse-api/Dockerfile b/.github/.devcontainer/podverse-api/Dockerfile similarity index 52% rename from .devcontainer/podverse-api/Dockerfile rename to .github/.devcontainer/podverse-api/Dockerfile index 3fad100..2670303 100644 --- a/.devcontainer/podverse-api/Dockerfile +++ b/.github/.devcontainer/podverse-api/Dockerfile @@ -1,4 +1,6 @@ FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm +# TODO switch to this before merging +# FROM ghcr.io/podverse/podverse-web-dev:latest # Update the package listing, so we know what package exist: RUN apt-get update \ @@ -10,4 +12,9 @@ RUN apt-get update \ # Create symbolic link so docker commands are handled as podman commands RUN ln -s /usr/bin/podman /usr/bin/docker -RUN adduser --disabled-login --gecos api_user api_user \ No newline at end of file +# create api_user but don't set the container user +RUN adduser --disabled-login --gecos api_user api_user + +LABEL org.opencontainers.image.source=https://github.com/podverse/podverse-ops +LABEL org.opencontainers.image.description="Podverse API Devcontainer" +LABEL org.opencontainers.image.licenses=AGPLv3 diff --git a/.github/.devcontainer/podverse-api/devcontainer.json b/.github/.devcontainer/podverse-api/devcontainer.json new file mode 100644 index 0000000..e99229b --- /dev/null +++ b/.github/.devcontainer/podverse-api/devcontainer.json @@ -0,0 +1,14 @@ +{ + "name": "Podverse API", + "build": { + "dockerfile": "./Dockerfile", + "context": "." + }, + "features": { + "ghcr.io/devcontainers/features/common-utils": {}, + "ghcr.io/devcontainers-extra/features/prettier": {}, + "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { + "version": "16" + } + } +} diff --git a/.github/.devcontainer/podverse-web/Dockerfile b/.github/.devcontainer/podverse-web/Dockerfile new file mode 100644 index 0000000..acd18ff --- /dev/null +++ b/.github/.devcontainer/podverse-web/Dockerfile @@ -0,0 +1,5 @@ +FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm + +LABEL org.opencontainers.image.source=https://github.com/podverse/podverse-ops +LABEL org.opencontainers.image.description="Podverse Web Devcontainer" +LABEL org.opencontainers.image.licenses=AGPLv3 diff --git a/.github/.devcontainer/podverse-web/devcontainer.json b/.github/.devcontainer/podverse-web/devcontainer.json new file mode 100644 index 0000000..03620af --- /dev/null +++ b/.github/.devcontainer/podverse-web/devcontainer.json @@ -0,0 +1,14 @@ +{ + "name": "Podverse Web", + "build": { + "dockerfile": "./Dockerfile", + "context": "." + }, + "features": { + "ghcr.io/devcontainers/features/common-utils": {}, + "ghcr.io/devcontainers-extra/features/prettier": {}, + "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { + "version": "16" + } + } +} diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..9d8f2d0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for more information: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates +# https://containers.dev/guide/dependabot + +version: 2 +updates: + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly diff --git a/.github/workflows/devcontainer-build-and-push.yml b/.github/workflows/devcontainer-build-and-push.yml new file mode 100644 index 0000000..4634517 --- /dev/null +++ b/.github/workflows/devcontainer-build-and-push.yml @@ -0,0 +1,41 @@ +name: Dev Container Build and Push Image + +on: + workflow_dispatch: + push: + branches: + - "master" + tags: + - "v*.*.*" + pull_requests: + branches: + - "master" +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout + id: checkout + uses: actions/checkout@v4 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.REGISTRY_TOKEN }} + - name: Pre-build Web devcontainer image + uses: devcontainers/ci@v0.3 + with: + subFolder: .github + configFile: .github/.devcontainer/podverse-web/devcontainer.json + imageName: ghcr.io/${{ github.actor }}/podverse-web-dev + cacheFrom: ghcr.io/${{ github.actor }}/podverse-web-dev + push: always + - name: Pre-build API devcontainer image + uses: devcontainers/ci@v0.3 + with: + subFolder: .github + configFile: .github/.devcontainer/podverse-api/devcontainer.json + imageName: ghcr.io/${{ github.actor }}/podverse-api-dev + cacheFrom: ghcr.io/${{ github.actor }}/podverse-api-dev + push: always From 0284ffb0ba38a1220d71b3675a9badf40221f79e Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Sun, 8 Dec 2024 21:35:06 -0800 Subject: [PATCH 8/9] Rewrite starting and stopping devcontainers. Signed-off-by: John Schmidt --- Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 4415186..409264d 100644 --- a/Makefile +++ b/Makefile @@ -323,19 +323,17 @@ sanbox_srv_docker-compose_up: sanbox_srv_docker-compose_up-no_dettach: docker-compose -f docker-compose/sandbox/srv/docker-compose.yml up -.PHONY: dev_init -dev_init: dev_init_web dev_init_api - -.PHONY: dev_init_web -dev_init_web: +.PHONY: dev_up +dev_up: @echo 'Starting devcontainers' - @devcontainer up --workspace-folder . --config .devcontainer/podverse-web/devcontainer.json - -.PHONY: dev_init_api -dev_init_api: - @echo 'Setting up api devcontainer' + @devcontainer up --prebuild --workspace-folder . --config .devcontainer/podverse-web/devcontainer.json @devcontainer set-up --config .devcontainer/podverse-api/devcontainer.json --container-id podverse_api_local +.PHONY: dev_down +dev_down: + @echo 'Stopping devcontainers' + @docker compose -f ./docker-compose/local/docker-compose.yml -f ./.devcontainer/docker-compose.yml down + .PHONY: dev_start_api dev_start_api: @echo 'Starting Podverse API node server' From 6b15b33118ac6328c6668cfbbbf60fe0a4a60daa Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Fri, 13 Dec 2024 21:13:37 -0800 Subject: [PATCH 9/9] fix: add advice for NODE_ENV in dev containers Signed-off-by: John Schmidt --- config/podverse-api-local.env.example | 4 ++++ config/podverse-web-local.env.example | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/podverse-api-local.env.example b/config/podverse-api-local.env.example index 3061161..76b2f68 100644 --- a/config/podverse-api-local.env.example +++ b/config/podverse-api-local.env.example @@ -15,6 +15,7 @@ ##### ##### App / General ##### +# Set NODE_ENV to development when using dev containers NODE_ENV=production PORT=1234 JWT_SECRET=your-secret-whatever @@ -26,6 +27,7 @@ USER_AGENT=Podverse/Feed Parser # Use the public facing domain, not the internal docker network ip address. COOKIE_DOMAIN=localhost +# for local dev setting this to false is probably ok COOKIE_IS_SECURE= # Some endpoints use RateLimiter middleware to prevent spamming requests. @@ -181,6 +183,8 @@ SHRUNK_IMAGE_SIZE=800 ##### FCM Google ##### ### We use FCM to send push notifications. +# in the devcontainer set this to /workspaces/config/google/jwt.keys.json +# follow the guide to get your key in podverse-ops/config/google/Firebase API key.md FCM_GOOGLE_API_AUTH_TOKEN= ##### diff --git a/config/podverse-web-local.env.example b/config/podverse-web-local.env.example index 3fda072..b799f85 100644 --- a/config/podverse-web-local.env.example +++ b/config/podverse-web-local.env.example @@ -15,8 +15,8 @@ ##### ##### App / General ##### - -NODE_ENV=develop +# set NODE_ENV to devlopment when using dev containers +NODE_ENV=production PORT=3000 API_PROTOCOL=http