Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix configuration for analytics dashboard #874

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Fix configuration for analytics dashboard #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4829b31
[#849] Fix broken docker compose
placek Apr 25, 2024
af3051a
[#849] Add build arg for docker image for analytics-dashboard
placek Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion govtool/analytics-dashboard/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN \

# Rebuild the source code only when needed
FROM base AS builder
ARG NEXT_PUBLIC_API_URL
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
Expand Down Expand Up @@ -62,4 +63,4 @@ ENV PORT 3000
ENV HOSTNAME "0.0.0.0"

# server.js is created by next build from the standalone output
CMD ["node", "server.js"]
CMD ["node", "server.js"]
4 changes: 3 additions & 1 deletion scripts/govtool/analytics-dashboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ analytics_dashboard_image_tag := $(shell git log -n 1 --format="%H" -- $(root_di
.PHONY: build-analytics-dashboard
build-analytics-dashboard:
$(call check_image_on_ecr,analytics-dashboard,$(analytics_dashboard_image_tag)) || \
$(docker) build --tag "$(repo_url)/analytics-dashboard:$(analytics_dashboard_image_tag)" $(root_dir)/govtool/analytics-dashboard
$(docker) build --tag "$(repo_url)/analytics-dashboard:$(analytics_dashboard_image_tag)" \
--build-arg NEXT_PUBLIC_API_URL="$${NEXT_PUBLIC_API_URL}" \
$(root_dir)/govtool/analytics-dashboard

.PHONY: push-analytics-dashboard
push-analytics-dashboard: build-analytics-dashboard
Expand Down
2 changes: 2 additions & 0 deletions scripts/govtool/config/templates/docker-compose.yml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ secrets:
file: /home/<DOCKER_USER>/config/dbsync-secrets/postgres_user
backend-config.json:
file: /home/<DOCKER_USER>/config/backend-config.json
google-credentials.json:
file: /home/<DOCKER_USER>/config/google-credentials.json

volumes:
letsencrypt:
Expand Down