coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2707 from gogits/docker/update 

Docker Container update
This commit is contained in:
Unknwon 2016-02-26 12:25:32 -05:00
parent 129638117f db14949209
commit 6465adfe5c
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.dockerignore
View File

@ -1,20 +1,21 @@
.git .git
.git/ .git/**
.git/*
conf conf
conf/ conf/**
conf/*
packager packager
packager/ packager/**
packager/*
scripts scripts
scripts/ scripts/**
scripts/* .github/
.github/**
config.codekit
LICENSE
Makefile
.dockerignore
*.yml *.yml
*.md *.md
.bra.toml .bra.toml
.editorconfig .editorconfig
.gitignore .gitignore
.gopmfile .gopmfile
config.codekit Dockerfile*
LICENSE

2
Dockerfile
View File

@ -2,7 +2,7 @@ FROM alpine:3.3
MAINTAINER jp@roemer.im MAINTAINER jp@roemer.im
# Install system utils & Gogs runtime dependencies # Install system utils & Gogs runtime dependencies
ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-amd64 /usr/sbin/gosu ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-amd64 /usr/sbin/gosu
RUN chmod +x /usr/sbin/gosu \ RUN chmod +x /usr/sbin/gosu \
&& apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat

11
Dockerfile.rpi
View File

@ -2,13 +2,12 @@ FROM hypriot/rpi-alpine-scratch:v3.2
MAINTAINER jp@roemer.im, raxetul@gmail.com MAINTAINER jp@roemer.im, raxetul@gmail.com
# Install system utils & Gogs runtime dependencies # Install system utils & Gogs runtime dependencies
ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-armhf /usr/sbin/gosu ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-armhf /usr/sbin/gosu
RUN echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \ RUN chmod +x /usr/sbin/gosu \
&& echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \
&& echo "http://dl-4.alpinelinux.org/alpine/v3.3/community/" | tee -a /etc/apk/repositories \ && echo "http://dl-4.alpinelinux.org/alpine/v3.3/community/" | tee -a /etc/apk/repositories \
&& echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \ && apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \
&& apk -U --no-progress upgrade \ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat
&& apk -U --no-progress add ca-certificates bash git linux-pam s6@edge curl openssh socat \
&& chmod +x /usr/sbin/gosu
ENV GOGS_CUSTOM /data/gogs ENV GOGS_CUSTOM /data/gogs

2
docker/README.md
View File

@ -88,4 +88,4 @@ Steps to upgrade Gogs with Docker:
## Known Issues ## Known Issues
- `.dockerignore` seems to be ignored during Docker Hub Automated build - The docker container can not currently be build on Raspberry 1 (armv6l) as our base image `alpine` does not have a `go` package available for this platform.

2
docker/build.sh
View File

@ -7,7 +7,7 @@ export GOPATH=/tmp/go
export PATH=${PATH}:${GOPATH}/bin export PATH=${PATH}:${GOPATH}/bin
# Install build deps # Install build deps
apk -U --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev apk --no-cache --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev
# Init go environment to build Gogs # Init go environment to build Gogs
mkdir -p ${GOPATH}/src/github.com/gogits/ mkdir -p ${GOPATH}/src/github.com/gogits/