Skip to content

Commit

Permalink
Update Dockerfile & build script and add /etc/nsswitch.conf:
Browse files Browse the repository at this point in the history
- Add nsswitch.conf to configure LibC Name Service inside the container
- Change my email in the Dockerfile
- Update build script to install software as a `build-deps` virtual package so that adding a package to it will be automatically	removed at the end of the build script
  • Loading branch information
0rax committed Jan 25, 2016
1 parent 38efa72 commit 9032bd0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.2
MAINTAINER roemer.jp@gmail.com
MAINTAINER jp@roemer.im

# Install system utils & Gogs runtime dependencies
ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-amd64 /usr/sbin/gosu
Expand All @@ -15,6 +15,9 @@ COPY . /app/gogs/
WORKDIR /app/gogs/
RUN ./docker/build.sh

# Configure LibC Name Service
COPY docker/nsswitch.conf /etc/nsswitch.conf

# Configure Docker Container
VOLUME ["/data"]
EXPOSE 22 3000
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile.rpi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM sander85/rpi-alpine:latest
MAINTAINER roemer.jp@gmail.com, raxetul@gmail.com
MAINTAINER jp@roemer.im, raxetul@gmail.com

# Install system utils & Gogs runtime dependencies
ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-armhf /usr/sbin/gosu
Expand All @@ -15,6 +15,9 @@ COPY . /app/gogs/
WORKDIR /app/gogs/
RUN ./docker/build.sh

# Configure LibC Name Service
COPY docker/nsswitch.conf /etc/nsswitch.conf

# Configure Docker Container
VOLUME ["/data"]
EXPOSE 22 3000
Expand Down
4 changes: 2 additions & 2 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export GOPATH=/tmp/go
export PATH=${PATH}:${GOPATH}/bin

# Install build deps
apk -U --no-progress add linux-pam-dev go@community gcc musl-dev
apk -U --no-progress add --virtual build-deps linux-pam-dev go@community gcc musl-dev

# Init go environment to build Gogs
mkdir -p ${GOPATH}/src/github.com/gogits/
Expand All @@ -20,7 +20,7 @@ go build -tags "sqlite cert pam"
rm -r $GOPATH

# Remove build deps
apk --no-progress del linux-pam-dev go gcc musl-dev
apk --no-progress del build-deps

# Create git user for Gogs
adduser -H -D -g 'Gogs Git User' git -h /data/git -s /bin/bash && passwd -u git
Expand Down
16 changes: 16 additions & 0 deletions docker/nsswitch.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# /etc/nsswitch.conf

passwd: compat
group: compat
shadow: compat

hosts: files dns
networks: files

protocols: db files
services: db files
ethers: db files
rpc: db files

netgroup: nis

0 comments on commit 9032bd0

Please sign in to comment.