Skip to content

Commit

Permalink
Merge pull request #2 from rumpl/remove-alpine
Browse files Browse the repository at this point in the history
Remove alpine
  • Loading branch information
glours committed Jul 8, 2021
2 parents 899c115 + 8d3f0f6 commit 0873ee9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.16-alpine AS build
FROM golang:1.16 AS build
WORKDIR /go/src/github.com/org/repo
COPY . .

RUN go build -o server .

FROM build AS development
RUN apk update \
&& apk add git
RUN apt-get update \
&& apt-get install -y git
CMD ["go", "run", "main.go"]

FROM alpine:3.12
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.7"
services:
backend:
build: backend
Expand Down
8 changes: 4 additions & 4 deletions proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx:1.21-alpine
FROM nginx:1.21

RUN apk update \
&& apk add git
RUN apt-get update \
&& apt-get install -y git

COPY conf /etc/nginx/conf.d/default.conf
COPY conf /etc/nginx/conf.d/default.conf

0 comments on commit 0873ee9

Please sign in to comment.