Skip to content

Docker image fixes #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Docker image fixes #117

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
185d898
update docker files to make it run again
willemvd Nov 7, 2016
85c4ef9
update docker files to make it run again (missed this one with git ad…
willemvd Nov 7, 2016
67e7798
clean up
willemvd Nov 8, 2016
cfbdaba
move to phusion/baseimage
willemvd Nov 9, 2016
f2d020a
* use new FROM docker image which includes unprivileged running of se…
willemvd Nov 17, 2016
8830d40
Merge branch 'phusion-baseimage'
willemvd Nov 17, 2016
a53069d
fixed some folder creation moments (user/my_init.d based instead of d…
willemvd Nov 18, 2016
b793023
OpenShift template for using Gitea (without PostgreSQL, but this is e…
willemvd Nov 18, 2016
e3b56d3
Merge remote-tracking branch 'upstream/master'
willemvd Nov 18, 2016
28f7d3a
merge upstream/master into master
willemvd Nov 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ config.codekit
.editorconfig
.gitignore
Dockerfile*
vendor
vendor/**
gogs
12 changes: 2 additions & 10 deletions docker/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,12 @@ export GO15VENDOREXPERIMENT=1
# Install build deps
apk --no-cache --no-progress add --virtual build-deps build-base linux-pam-dev go

# Install glide
git clone -b 0.10.2 https://github.com/Masterminds/glide ${GOPATH}/src/github.com/Masterminds/glide
cd ${GOPATH}/src/github.com/Masterminds/glide
make build
go install



# Build Gogs
mkdir -p ${GOPATH}/src/github.com/gogits/
mkdir -p ${GOPATH}/src/github.com/go-gitea/
ln -s /app/gogs/ ${GOPATH}/src/github.com/go-gitea/gitea
cd ${GOPATH}/src/github.com/go-gitea/gitea
glide install
make build TAGS="sqlite cert pam"
go install

# Cleanup GOPATH & vendoring dir
rm -r $GOPATH /app/gogs/vendor
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should it be /app/gitea/vendor ?

Expand Down
2 changes: 1 addition & 1 deletion docker/s6/gogs/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ if test -f ./setup; then
fi

export USER=git
exec gosu $USER /app/gogs/gogs web
exec gosu $USER /app/gogs/gitea web
2 changes: 2 additions & 0 deletions docker/s6/gogs/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ ln -sf /data/git /home/git

chown -R git:git /data /app/gogs ~git/
chmod 0755 /data /data/gogs ~git/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't these two lines be changed as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And you'd have to update the Dockerfile as well then.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would this need a change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to be named "gitea" instead of "gogs" ?


mv /app/gogs/bin/gitea /app/gogs/gitea