summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJean-Philippe Roemer <roemer.jp@gmail.com>2016-01-25 13:07:37 +0000
committerJean-Philippe Roemer <roemer.jp@gmail.com>2016-01-25 13:07:37 +0000
commit9032bd097be863ec7e27b2b56f641937f65067c3 (patch)
tree9b1644543afa17531facc265c0dfbbde7ca1c6cb /docker
parent38efa72146eb8caeed0140f36a8e322c1426fda1 (diff)
downloadgitea-9032bd097be863ec7e27b2b56f641937f65067c3.tar.gz
gitea-9032bd097be863ec7e27b2b56f641937f65067c3.zip
Update Dockerfile & build script and add /etc/nsswitch.conf:
- 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
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/build.sh4
-rw-r--r--docker/nsswitch.conf16
2 files changed, 18 insertions, 2 deletions
diff --git a/docker/build.sh b/docker/build.sh
index 4249b1d122..83ef8f2b2b 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -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/
@@ -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
diff --git a/docker/nsswitch.conf b/docker/nsswitch.conf
new file mode 100644
index 0000000000..70eb1733f4
--- /dev/null
+++ b/docker/nsswitch.conf
@@ -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
+