Quellcode durchsuchen

feat: better dockerfile caching

Fela Maslen vor 5 Jahren
Ursprung
Commit
e2bd4ad9bb
3 geänderte Dateien mit 23 neuen und 17 gelöschten Zeilen
  1. 11 6
      gmus-backend/Dockerfile
  2. 1 11
      gmus-web/Dockerfile
  3. 11 0
      gmus-web/builder.Dockerfile

+ 11 - 6
gmus-backend/Dockerfile

@@ -1,15 +1,20 @@
 FROM golang:1.15-alpine
 
-RUN apk update && apk add make gcc libc-dev libvorbis-dev
+RUN apk update && apk add make gcc libc-dev libvorbis-dev libvorbis
 
 WORKDIR /app
-COPY . .
 
-RUN make clean
-RUN make build
+COPY go.mod go.sum ./
+RUN go mod download
 
-RUN apk del make gcc libc-dev libvorbis-dev && \
-  apk update && apk add libvorbis
+COPY Makefile ./
+COPY migrations ./migrations
+COPY pkg ./pkg
+COPY cmd ./cmd
+
+RUN make clean && make build
+
+RUN apk del gcc libc-dev libvorbis-dev
 
 RUN addgroup -S appgroup && adduser -S appuser -G appgroup
 USER appuser

+ 1 - 11
gmus-web/Dockerfile

@@ -1,14 +1,4 @@
-FROM node:14-alpine AS builder
-
-WORKDIR /app
-COPY package.json yarn.lock ./
-RUN yarn
-COPY src ./src
-COPY public ./public
-COPY tsconfig.json .
-
-ENV REACT_APP_API_URL=http://localhost:3002
-RUN yarn build && rm -rf node_modules
+FROM docker.fela.space/gmus-web-builder:latest
 
 FROM nginx:alpine
 

+ 11 - 0
gmus-web/builder.Dockerfile

@@ -0,0 +1,11 @@
+FROM node:14-alpine AS builder
+
+WORKDIR /app
+COPY package.json yarn.lock ./
+RUN yarn
+COPY src ./src
+COPY public ./public
+COPY tsconfig.json .
+
+ENV REACT_APP_API_URL=http://localhost:3002
+RUN yarn build