Skip to content

Commit

Permalink
build: update debian, fedora, and node
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdecaf committed Nov 14, 2023
1 parent 58b0af1 commit fbbd151
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.21-bullseye as backend
FROM golang:1.21-bookworm as backend
WORKDIR /go/src/github.com/moov-io/watchman
RUN apt-get update && apt-get upgrade -y && apt-get install make gcc g++
COPY . .
RUN go mod download
RUN make build-server

FROM node:19-bullseye as frontend
FROM node:21-bookworm as frontend
COPY webui/ /watchman/
WORKDIR /watchman/
RUN npm install --legacy-peer-deps
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-openshift
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM quay.io/fedora/fedora:39-x86_64 as builder
FROM quay.io/fedora/fedora:40-x86_64 as builder
RUN yum install -y git golang make npm wget glibc
WORKDIR /opt/app-root/src/
COPY . .
RUN make build

FROM node:20-buster as frontend
FROM node:21-bookworm as frontend
COPY webui/ /watchman/
WORKDIR /watchman/
RUN npm install --legacy-peer-deps
RUN npm run build

FROM quay.io/fedora/fedora:39-x86_64
FROM quay.io/fedora/fedora:40-x86_64
RUN yum install -y glibc

ARG VERSION=unknown
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ services:
ports:
- "8084:8084"
- "9094:9094"

networks:
intranet: {}

0 comments on commit fbbd151

Please sign in to comment.