decozo
/
okapidemo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove js output

Browse Source
master
Bas Kloosterman 2 years ago
parent d1b06bc3c6
commit cf91da65d3
5 changed files with 27 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .dockerignore
  2. 3
      .gitignore
  3. 11
      Dockerfile.dvza
  4. 11
      Dockerfile.his
  5. 11
      Dockerfile.wbx

2
.dockerignore
Unescape View File

@ -1,5 +1,5 @@
**/.git **/.git
**/node_modules **/node_modules
**/app **/assets
**/data/data.db **/data/data.db
**/certs **/certs

3
.gitignore vendored
Unescape View File

@ -1,3 +1,4 @@
node_modules node_modules
data.db data.db
certs certs
assets

11
Dockerfile.dvza
Unescape View File

@ -3,11 +3,12 @@
## ##
## Build ## Build
## ##
FROM golang:1.18-alpine AS build FROM golang:1.19-alpine AS build
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade
RUN apk add build-base git RUN apk add build-base git
RUN apk add --update npm
WORKDIR /app WORKDIR /app
@ -20,16 +21,20 @@ WORKDIR /app/dvzaservice
RUN go build -o /app/bin/dvza RUN go build -o /app/bin/dvza
WORKDIR /app/dvzaservice/app
RUN npm i
RUN npx webpack
## ##
## Deploy ## Deploy
## ##
FROM golang:1.18-alpine FROM alpine
WORKDIR / WORKDIR /
COPY ./dvzaservice/assets /assets
COPY ./dvzaservice/templates /templates COPY ./dvzaservice/templates /templates
COPY --from=build /app/bin/dvza ./dvza COPY --from=build /app/bin/dvza ./dvza
COPY --from=build /app/dvzaservice/assets ./assets
RUN adduser -D nonroot RUN adduser -D nonroot
USER nonroot:nonroot USER nonroot:nonroot

11
Dockerfile.his
Unescape View File

@ -3,11 +3,12 @@
## ##
## Build ## Build
## ##
FROM golang:1.18-alpine AS build FROM golang:1.19-alpine AS build
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade
RUN apk add build-base git RUN apk add build-base git
RUN apk add --update npm
WORKDIR /app WORKDIR /app
@ -20,17 +21,21 @@ WORKDIR /app/his
RUN go build -o /app/bin/his RUN go build -o /app/bin/his
WORKDIR /app/his/app
RUN npm i
RUN npx webpack
## ##
## Deploy ## Deploy
## ##
FROM golang:1.18-alpine FROM alpine
WORKDIR / WORKDIR /
COPY ./his/assets /assets
COPY ./his/templates /templates COPY ./his/templates /templates
COPY ./his/patients /patients COPY ./his/patients /patients
COPY --from=build /app/bin/his ./his COPY --from=build /app/bin/his ./his
COPY --from=build /app/his/assets ./assets
RUN adduser -D nonroot RUN adduser -D nonroot
USER nonroot:nonroot USER nonroot:nonroot

11
Dockerfile.wbx
Unescape View File

@ -3,11 +3,12 @@
## ##
## Build ## Build
## ##
FROM golang:1.18-alpine AS build FROM golang:1.19-alpine AS build
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade
RUN apk add build-base git RUN apk add build-base git
RUN apk add --update npm
WORKDIR /app WORKDIR /app
@ -20,17 +21,21 @@ WORKDIR /app/whiteboxservice
RUN go build -o /app/bin/wbx RUN go build -o /app/bin/wbx
WORKDIR /app/whiteboxservice/app
RUN npm i
RUN npx webpack
## ##
## Deploy ## Deploy
## ##
FROM golang:1.18-alpine FROM alpine
WORKDIR / WORKDIR /
COPY ./whiteboxservice/assets /assets
COPY ./whiteboxservice/templates /templates COPY ./whiteboxservice/templates /templates
COPY ./whiteboxservice/bin/amd64 /wbxbin COPY ./whiteboxservice/bin/amd64 /wbxbin
COPY --from=build /app/bin/wbx ./wbx COPY --from=build /app/bin/wbx ./wbx
COPY --from=build /app/whiteboxservice/assets ./assets
RUN adduser -D nonroot RUN adduser -D nonroot
USER nonroot:nonroot USER nonroot:nonroot

Write Preview
Loading…
Cancel
Save