-
Notifications
You must be signed in to change notification settings - Fork 2
Fully Update Development to Dev Containers #1389
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
e2d6686
added client docker containers
9a662f7
docker works with client,server and db
0c6a5a0
removed old docker-compose
1b74a50
vscode style local docker containers working
6e7700b
Revert "removed old docker-compose"
727c15f
Reapply "removed old docker-compose"
c4ac177
Revert "vscode style local docker containers working"
a4fc708
optimized docker file and removed unused code
2dfa5ab
migrated to vite and removed jest
b3c5472
remove require in favor of import
e522671
refactored to react-color
cf44380
removed unused things
53a608e
merge with dev
765b63d
scss changes
6868d64
all process.env changed
f43444a
navigation works, no site errors
cb30284
small commit
ba409d5
HMR works
1b1a745
extrapolated docker files into separate docker container environments…
c81dda5
compiles with no errors, avataaars removed
fe055cf
separated colors
e06a4c9
got avatars to work with default values
04a7709
pog
10f7d7d
lab 6 works
ac45bb9
avatars work!
d9e75f9
Merge branch 'dev' into 1121-story-update-cd-to-fully-dockerterraform
ed9d5fc
light optimizations
5852dca
Merge branch 'dev' into 1121-story-update-cd-to-fully-dockerterraform
shmowen 76b957a
Merge branch 'dev' into 1121-story-update-cd-to-fully-dockerterraform
shmowen cefbc0d
fix HMR full-reloads, document docker env vars, restore CI build check
35ff4bb
Merge remote-tracking branch 'origin/1121-story-update-cd-to-fully-do…
39faa10
fail deploy builds loudly if VITE_SERVER_URL is missing
2503826
prevent .env secrets and .git from being baked into docker images
89b811c
add CI check that builds the devcontainer images
d227a19
regenerate lockfiles, fixing CI build failure and package.json drift
86bf80f
Remove unused imports in mainFooter.js
a2f0008
Finish CRA->Vite env var migration in leftover service files
a4d403b
Scope GITHUB_TOKEN permissions in docker-build-check.yml
b9a1e67
Merge remote-tracking branch 'origin/dev' into 1121-story-update-cd-t…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| FROM node:20-alpine | ||
| RUN apk update && apk add --no-cache git |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "name": "ALL Development", | ||
|
|
||
| "dockerComposeFile": "docker-compose.yml", | ||
| "service": "container", | ||
|
|
||
| "workspaceFolder": "/workspace", | ||
| "features": { | ||
| "ghcr.io/devcontainers/features/common-utils:2": { | ||
| "installZsh": true, | ||
| "configureZshOhMyZsh": true, | ||
| "upgradePackages": true, | ||
| "username": "root" | ||
| }, | ||
| "ghcr.io/devcontainers/features/git:1": "latest" | ||
| // Other dev tools can be found here: https://containers.dev/features | ||
| }, | ||
| "customizations": { | ||
| "vscode": { | ||
| "extensions": [ | ||
| "dbaeumer.vscode-eslint", | ||
| // "esbenp.prettier-vscode" | ||
| "ms-azuretools.vscode-docker" | ||
| ] | ||
| } | ||
| }, | ||
| "remoteUser": "root" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| services: | ||
| container: | ||
| build: | ||
| context: . | ||
| dockerfile: Dockerfile | ||
| volumes: | ||
| - ..:/workspace:cached | ||
| command: sleep infinity | ||
| db: | ||
| image: postgres | ||
| ports: | ||
| - '5433:5433' | ||
| restart: always | ||
| env_file: | ||
| - ../server/.env | ||
| volumes: | ||
| - ../server/database/schema.sql:/docker-entrypoint-initdb.d/schema.sql | ||
| command: -p 5433 | ||
| healthcheck: | ||
| test: ['CMD-SHELL', 'pg_isready -p 5433 -U $$POSTGRES_USER -d postgres'] | ||
| interval: 5s | ||
| timeout: 5s | ||
| retries: 5 | ||
| server: | ||
| build: | ||
| context: ../server | ||
| dockerfile: Dockerfile | ||
| volumes: | ||
| - ../server:/app | ||
| - /app/node_modules | ||
| ports: | ||
| - '5005:5005' | ||
| depends_on: | ||
| db: | ||
| condition: service_healthy | ||
| client: | ||
| build: | ||
| context: ../client | ||
| dockerfile: Dockerfile | ||
| environment: | ||
| VITE_WATCH_POLL_INTERVAL: '500' | ||
| volumes: | ||
| - ../client:/app | ||
| - /app/node_modules | ||
| ports: | ||
| - '3000:3000' | ||
| depends_on: | ||
| - server |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: Docker Build Check | ||
|
|
||
| # Validates that the devcontainer images still build. Does not boot the | ||
| # stack or exercise runtime behavior (env vars, DB connectivity, etc.) — | ||
| # see .devcontainer/docker-compose.yml and README.md for those concerns. | ||
| on: | ||
| pull_request: | ||
| branches: ["prod", "dev"] | ||
| paths: | ||
| - "client/Dockerfile" | ||
| - "client/package.json" | ||
| - "client/package-lock.json" | ||
| - "server/Dockerfile" | ||
| - "server/package.json" | ||
| - "server/package-lock.json" | ||
| - ".devcontainer/**" | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Build devcontainer images | ||
| run: docker compose -f .devcontainer/docker-compose.yml build | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ server/service_key.json | |
| # IDE-specific directories | ||
| .idea/ | ||
| .vscode/ | ||
| .cursor/ | ||
|
|
||
| # SSL Certificates | ||
| *.crt | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| node_modules | ||
| build | ||
| package-lock.json | ||
| .git | ||
| .env | ||
| .env.* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| FROM node:20-alpine AS dependencies-env | ||
| WORKDIR /app | ||
| COPY package*.json ./ | ||
| RUN npm install --legacy-peer-deps | ||
|
|
||
| FROM node:20-alpine | ||
| WORKDIR /app | ||
| COPY --from=dependencies-env /app/node_modules /app/node_modules | ||
| COPY . ./ | ||
| ENV CHOKIDAR_USEPOLLING=true | ||
| ENV CHOKIDAR_INTERVAL=500 | ||
| CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0", "--port", "3000"] |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.