Docker image fixes #117

willemvd · 2016-11-08T08:42:51Z

Docker build was broken due to different naming of the artifact from Go, paths changed and glide has been removed.
This should fix these issues (haven't got time to properly test it all)

Signed-off-by: Willem van Dreumel ([email protected])

…d *)

codecov-io · 2016-11-08T08:55:19Z

Current coverage is 3.03% (diff: 100%)

Merging #117 into master will not change coverage

@@            master      #117   diff @@
========================================
  Files           33        33          
  Lines         8106      8106          
  Methods          0         0          
  Messages         0         0          
  Branches         0         0          
========================================
  Hits           246       246          
  Misses        7840      7840          
  Partials        20        20

Powered by Codecov. Last update cf045b0...28f7d3a

bkcsoft · 2016-11-08T09:32:48Z

docker/s6/gogs/setup

@@ -21,3 +21,5 @@ ln -sf /data/git /home/git

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


shouldn't these two lines be changed as well?

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

Why would this need a change?

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

strk · 2016-11-08T13:47:35Z

docker/build.sh

 make build TAGS="sqlite cert pam"
+go install

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


Should it be /app/gitea/vendor ?

xinity · 2016-11-08T13:51:50Z

i think we should move out of the Dockerfile the build process
as @tboerger will build binaries, we'll just have to add them in the shipped IMAGE.
PR incoming in my case :)

ghost · 2016-11-08T15:07:55Z

@Xinty Actually, the whole point of a Dockerfile is to allow the user to build the binary him/herself. We should not be putting binaries in there if we can build it ourselves.

metalmatze · 2016-11-08T17:27:12Z

Not sure if I understand @LefsFlarey correctly. But what will happen is that everyone can simply run make buildon their machine and create a binary. Our CI Pipeline will then use the binary created by the same command and simply copy it into the docker image. No need to have Go inside the container. Just a binary.
Right @tboerger ?

xinity · 2016-11-08T18:08:09Z

Agree @metalmaze

ghost · 2016-11-09T02:47:26Z

Well... I don't know. Building a binary for every OS has to be automated somehow.

tboerger · 2016-11-09T05:52:29Z

It will be automated, the makefile tasks are already there, just need to add drone as ci

…rvices syslog-ng, cron and sshd (so it can run on OpenShift v3) * building of gitea is still in the image creation it self, but can be simply be changed when using a pre-build artifact * renamed all folder paths to gitea instead of gogs run with: docker run --rm -p 2222:2222 -p 3000:3000 -v /tmp/docker-ssh-keys:/etc/ssh/keys -v /tmp/docker-data:/data -u $randomHighUserId $buildNumber

# Conflicts: # docker/build.sh

…ocker image build)

…asy to add on runtime)

# Conflicts: # Dockerfile # docker/build.sh # docker/s6/gogs/setup

willemvd · 2016-11-18T16:09:39Z

Changed the whole docker image to be able to run it as unprivileged user (needed for some docker environments like OpenShift v3 which do not allow to run as root) and merged the current master into the pull request

tboerger · 2016-11-24T10:05:05Z

I'm really not a fan of the current approach. I really dislike the switch away from Alpine.

leitzler · 2016-11-25T22:28:42Z

Dockerfile

@@ -1,22 +1,22 @@
-FROM alpine:3.3
-MAINTAINER [email protected]
+FROM willemvd/ubuntu-unprivileged-git-ssh:latest


This opens up a huge security hole and should not, in any way, be accepted by the maintainers of Gitea.

I agree, what's wrong with alpine?

stevenroose · 2016-11-27T22:46:34Z

It should definitively be possible to build Gitea on an alpine container without too much hassle.

tboerger · 2016-11-28T07:40:52Z

So we agree to build only on official images

tboerger · 2016-11-28T13:20:39Z

Should we take #288 in favor of this?

tboerger · 2016-11-29T06:23:06Z

Thanks for the work, we have merged #288 now to properly build docker images.

* use dep instead of govendor * remove example * change dependenci github.com/Unknwon from 1.0 to master

willemvd added 3 commits November 7, 2016 15:05

update docker files to make it run again

185d898

update docker files to make it run again (missed this one with git ad…

85c4ef9

…d *)

clean up

67e7798

bkcsoft suggested changes Nov 8, 2016

View reviewed changes

xinity added the type/enhancement An improvement of existing functionality label Nov 8, 2016

xinity self-assigned this Nov 8, 2016

xinity added this to the 1.0.0 milestone Nov 8, 2016

strk reviewed Nov 8, 2016

View reviewed changes

lunny added the in progress label Nov 9, 2016

move to phusion/baseimage

cfbdaba

lunny removed the in progress label Nov 10, 2016

willemvd added 6 commits November 17, 2016 15:11

Merge branch 'phusion-baseimage'

8830d40

# Conflicts: # docker/build.sh

fixed some folder creation moments (user/my_init.d based instead of d…

a53069d

…ocker image build)

OpenShift template for using Gitea (without PostgreSQL, but this is e…

b793023

…asy to add on runtime)

Merge remote-tracking branch 'upstream/master'

e3b56d3

# Conflicts: # Dockerfile # docker/build.sh # docker/s6/gogs/setup

merge upstream/master into master

28f7d3a

tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 24, 2016

leitzler suggested changes Nov 25, 2016

View reviewed changes

tboerger added status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail labels Nov 28, 2016

tboerger mentioned this pull request Nov 28, 2016

Docker integration #288

Merged

tboerger closed this Nov 29, 2016

tboerger removed this from the 1.0.0 milestone Nov 29, 2016

lunny added a commit to lunny/gitea that referenced this pull request Feb 7, 2019

Use dep instead of govendor (go-gitea#117)

622cdd1

* use dep instead of govendor * remove example * change dependenci github.com/Unknwon from 1.0 to master

go-gitea locked and limited conversation to collaborators Nov 23, 2020

		@@ -21,3 +21,5 @@ ln -sf /data/git /home/git

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

Uh oh!

Docker image fixes #117

Docker image fixes #117

Uh oh!

Conversation

willemvd commented Nov 8, 2016

Uh oh!

codecov-io commented Nov 8, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current coverage is 3.03% (diff: 100%)

Uh oh!

bkcsoft Nov 8, 2016

Choose a reason for hiding this comment

Uh oh!

bkcsoft Nov 8, 2016

Choose a reason for hiding this comment

Uh oh!

willemvd Nov 8, 2016

Choose a reason for hiding this comment

Uh oh!

strk Nov 8, 2016

Choose a reason for hiding this comment

Uh oh!

strk Nov 8, 2016

Choose a reason for hiding this comment

Uh oh!

xinity commented Nov 8, 2016

Uh oh!

ghost commented Nov 8, 2016

Uh oh!

metalmatze commented Nov 8, 2016

Uh oh!

xinity commented Nov 8, 2016

Uh oh!

ghost commented Nov 9, 2016

Uh oh!

tboerger commented Nov 9, 2016

Uh oh!

willemvd commented Nov 18, 2016

Uh oh!

tboerger commented Nov 24, 2016

Uh oh!

leitzler Nov 25, 2016

Choose a reason for hiding this comment

Uh oh!

ghost Nov 28, 2016

Choose a reason for hiding this comment

Uh oh!

stevenroose commented Nov 27, 2016

Uh oh!

tboerger commented Nov 28, 2016

Uh oh!

tboerger commented Nov 28, 2016

Uh oh!

tboerger commented Nov 29, 2016

Uh oh!

Uh oh!

codecov-io commented Nov 8, 2016 •

edited

Loading