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

Docker improvements #281

Merged
merged 3 commits into from
Nov 22, 2024
Merged

Docker improvements #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43e3f8a
Remove obsolete version attribute from docker-compose
dsgnr Nov 22, 2024
3236640
Fix FromAsCasing warning on docker build
dsgnr Nov 22, 2024
5ee7a07
Add missing yarn lock for dev, and set env
dsgnr Nov 22, 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
1 change: 0 additions & 1 deletion docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"
services:
web:
build:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"
services:
web:
image: ghcr.io/dsgnr/portcheckerio-web:latest
Expand Down
4 changes: 2 additions & 2 deletions frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:23-alpine3.19 as builder
FROM node:23-alpine3.19 AS builder
ARG DEFAULT_PORT GOOGLE_ANALYTICS
ENV DEFAULT_PORT=$DEFAULT_PORT
ENV GOOGLE_ANALYTICS=$GOOGLE_ANALYTICS
Expand All @@ -8,7 +8,7 @@ WORKDIR /app
RUN yarn install && yarn build

# production environment
FROM nginx:stable-alpine-slim as web
FROM nginx:stable-alpine-slim AS web
ARG DEFAULT_PORT
ENV DEFAULT_PORT=$DEFAULT_PORT
COPY --from=builder /app/dist /usr/share/nginx/html
Expand Down
5 changes: 3 additions & 2 deletions frontend/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM node:23-alpine3.19
FROM node:23-alpine3.19
ENV PATH=$PATH:$PWD/node_modules/.bin

# ALlows the user to define a default port to populate the UI.
# Pass a desired value in your docker run/compose environment
ARG DEFAULT_PORT
ENV DEFAULT_PORT=$DEFAULT_PORT

COPY web/package.json ./
COPY web/package.json web/yarn.lock ./
RUN yarn install
COPY ./web ./web
WORKDIR /web
Expand Down