unixninja92
/
server
forked from cwtch.im/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy up Dockerfile before PR

This commit is contained in:
NetworksAreMadeOfString 2021-08-10 12:56:00 +01:00
parent 5d127582f3
commit fcd038487e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:latest as tor-build-stage FROM alpine:latest as tor-build-stage
# Install prerequisites # Install prerequisites, grab tor, compile it and move to /usr/local
RUN apk --no-cache add --update \ RUN apk --no-cache add --update \
gnupg \ gnupg \
build-base \ build-base \
@ -26,24 +26,28 @@ RUN apk --no-cache add --update \
#----------------------------------------------- #-----------------------------------------------
FROM golang:alpine as cwtch-build-stage FROM golang:alpine as cwtch-build-stage
# Need additional packages for cgo etc
RUN apk --no-cache add --update gcc build-base RUN apk --no-cache add --update gcc build-base
# Copy source files from the repo to /go/src
COPY . src/ COPY . src/
#Build Cwtch
RUN cd src/app && go build RUN cd src/app && go build
FROM alpine:latest FROM alpine:latest
#BSD habits die hard #Specify user account aliases
ENV TOR_USER=_tor CWTCH_USER=_cwtch ENV TOR_USER=_tor CWTCH_USER=_cwtch
# Installing dependencies of Tor and pwgen # Installing dependencies of Tor
RUN apk --no-cache add --update \ RUN apk --no-cache add --update \
libevent \ libevent \
libressl \ libressl \
xz-libs \ xz-libs \
zlib \ zlib \
zstd \ zstd \
zstd-dev \ zstd-dev
pwgen
# Copy Tor # Copy Tor
COPY --from=tor-build-stage /usr/local/ /usr/local/ COPY --from=tor-build-stage /usr/local/ /usr/local/
@ -51,7 +55,7 @@ COPY --from=tor-build-stage /usr/local/ /usr/local/
#Copy cwtch app #Copy cwtch app
COPY --from=cwtch-build-stage /go/src/app/app /usr/local/bin/cwtch COPY --from=cwtch-build-stage /go/src/app/app /usr/local/bin/cwtch
# Create an unprivileged tor user # Create unprivileged users
RUN mkdir -p /run/tor && mkdir /etc/cwtch && addgroup -S $TOR_USER && adduser -G $TOR_USER -S $TOR_USER && adduser -S $CWTCH_USER RUN mkdir -p /run/tor && mkdir /etc/cwtch && addgroup -S $TOR_USER && adduser -G $TOR_USER -S $TOR_USER && adduser -S $CWTCH_USER
# Copy Tor configuration file # Copy Tor configuration file