Commit Graph

71 Commits

Author SHA1 Message Date
Tao Wang 41cc110e62 Use sqlite3 database as default for Docker image ()
Signed-off-by: Tao Wang <twang2218@gmail.com>
2017-07-26 15:21:23 +08:00
Thomas Boerger c6b6a61bf1 Fixing multiple docker issues ()
* Added stupid docker task to makefile

* Dropped unknown option PrintLastLog from docker ssh config

* OpenSSH should log to docker stdout

* Set random pw for docker git user, otherwise it is locked

* Stop using templates and public within docker
2016-12-15 17:16:55 +08:00
Thomas Boerger 65d0426b91
Use su-exec instead of gosu, much smaller 2016-11-28 17:16:13 +01:00
Thomas Boerger 86aa8e413a
Restructured docker building
I have restructured the docker build process entirely, the binary gets
built outside of the docker build command, now we are managing all
dependencies with real Alpine packages and I have dropped features like
socat or the cron daemon.

Signed-off-by: Thomas Boerger <tboerger@suse.de>
2016-11-28 14:13:18 +01:00
Sandro Santilli b7263f31a5 Replace GOGS with GITEA in variable names
Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.

Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...

Closes 
2016-11-07 16:05:18 +01:00
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs () 2016-11-03 10:29:56 -02:00
rugk 28dc5bb566 Replace gogs.io http links with https version () 2016-08-05 17:35:40 -07:00
Unknwon 160956dd31 Update Docker README 2016-07-15 14:32:42 +08:00
Jean-Philippe Roemer bcd4adb3a0 Update docker/build.sh script to use glide & make ()
* docker: update build script to use glide + make

- docker/build.sh will now use glide to fetch dependencies
- glide is built from source to keep compatibility with arm
  (no pre-prebuilt binary for arm)
- docker/build.sh will also now use the provided Makefile
  It will generate an error when trying to get git build has as we do
  not ship the 88mo .git directory during the build (should not cause
  any problem as the variable it sets was not set previously)

* docker: fix docker arm build

- drop gosu version back to 1.7 as gosu binary for armhf is broken
- see 

* docker: update gosu to 1.9

Signed-off-by: Jean-Philippe Roemer <jp@roemer.im>
2016-05-11 13:11:59 -04:00
Jean-Philippe Roemer 69e00f9948 docker: update documentation for container options ()
- Created a Container options section in `docker/README.md`
- Add documentation for SOCAT_LINK
- Move CROND documentation to the new section
2016-04-12 10:46:32 -04:00
Unknwon ac53bb593d print error of JSON unmarshal and always returns a valid object 2016-03-26 16:42:20 -04:00
Mike 9d44cd79ee update README.md
minor grammar fix
2016-02-28 21:17:19 -05:00
Unknwon d320915ad2 Minor fix for 2016-02-27 11:31:24 -05:00
Jean-Philippe Roemer db14949209 Update Docker REAMDE.md
- Remove the known issue about `.dockerignore` being ignored during DockerHub automated build as this has been fixed
- Added a note on the fact that we currently do no support building the container on RPi1
2016-02-26 17:07:31 +00:00
Jean-Philippe Roemer 7845075bd2 Dockerfile & Dockerfile.pi updates
- Upgrade of gosu to v1.7
- Change in docker/build.sh to use `--no-cache` to prevent APKINDEX creation when installing dev dependencies
- Manual upgrade of Alpine on Raspberry Pi when building to make sure the environment is the same as the standard Dockerfile
2016-02-25 20:43:40 +00:00
Unknwon 779bb890fa Minor docs update for 2016-02-12 08:18:12 -05:00
Jean-Philippe Roemer f4bc9263d9 Add the ability to run crond inside the Docker container
- Add the crond init script for s6
- Add the RUN_CROND configuration variable to setup crond
- Crond will not be run by default (hence the `down` file in the service directory)
- `start.sh` check if RUN_CROND = "true" || "1" and remove this file to tell s6 to run the initscript
- Resolves 
2016-02-12 02:48:55 +00:00
Unknwon 894946c319 Merge pull request from
Add an important note about mapping the ssh port on the container to the host
2016-02-06 20:22:43 -05:00
Jean-Philippe Roemer 12c8953381 Update Dockerfile to update alpine to v3.3 & fix virtual package and repository pinning on RPi
- Dockerfile now uses alpine:3.3 as base
- Dockerfile.rpi now uses v3.3/community repository without pinning
- Go package is no longer fetched using repository pinning
- Fixes problem while using repository pinning & virtual package at the same time
2016-01-28 21:31:45 +00:00
Unknwon a849ac0164 Merge pull request from jgsqware/develop
Add Docker Volume from 1.9
2016-01-26 13:45:24 -05:00
Jean-Philippe Roemer 9032bd097b 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
2016-01-25 13:07:37 +00:00
juliengarcia eb14fbf95f Add Docker Volume from 1.9 2016-01-20 16:54:38 +01:00
James Mills f36c82c3b3 Add an important note about mapping the ssh port on the container to the host 2016-01-19 22:24:40 -08:00
Ivan Marban 4ea75dfcbe Remove RSA1 keys as only SSH version 2 is used 2016-01-06 10:26:37 +01:00
Unknwon 9cd16c5b12 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon 351dfc95a9 prepare release 2015-12-12 21:58:54 -05:00
Unknwon 5d95ffe3eb The owner has reached maximum creation limit of 0 repositories 2015-12-11 15:11:13 -05:00
Unknwon b1a53f6d8e add quay.io as another Docker option 2015-12-07 19:40:24 -05:00
Unknwon e538ff2770 fix and fix 2015-12-04 21:30:33 -05:00
Jean-Philippe Roemer 3deddabfd8 Add `set -x` & `set -e` to docker/build.sh for better debugging 2015-11-16 16:49:40 +00:00
Jean-Philippe Roemer 0cbf56855a Update s6 path following package update 2015-11-16 16:48:09 +00:00
Jean-Philippe Roemer 14a8a46bec Add logging when socat link creation is deactivated 2015-11-04 19:43:25 +00:00
Jean-Philippe Roemer 7679aa1a21 Fix typo & cleanup start.sh code 2015-11-04 19:34:26 +00:00
Jean-Philippe Roemer 9a8aeef478 Add syslog & fix `/data/git` rights & SOCAT_LINK env var
- Resolve 
- Add syslogd to output sshd log on stdout (via `docker logs`)
- Enforce directory rights on `/data/git`, `/data/gogs` & `/data/ssh`
- Add `SOCAT_LINK` environment variable to prevent the creation of scout links when they are not needed (see )
2015-11-04 19:22:15 +00:00
Jean-Philippe Roemer f7c7837fc8 Docker socat link: default port fix
- Remove port 80 & 443 unused by the container
- Add port 3000 used by gogs application
2015-10-21 16:55:55 +01:00
Jean-Philippe Roemer 02289479ef Docker `socat` link creation
- `start.sh` will now verify that the port is not already used by another service
- Resolve 
- Log when a service is created, or could not be created
- Keep track of which port is already used, including goes & sshd port
2015-10-21 16:27:56 +01:00
Limian Wang b854d3ba40 fix typo in README for Docker 2015-10-13 15:22:33 -07:00
Jean-Philippe Roemer 9acf02ad7f Fix bug introduced in preventing ssh server to launch
- ssh/setup: test directive now check if a file exist in key path instead of a folder
- ssh/setup script was hanging waiting for an input about rewriting the key
  as the test case was returning true, when it should have been false
  (check if file is a folder instead of a file)
2015-10-12 22:13:22 +01:00
Jean-Philippe Roemer 533c6a8e08 Edit comment to make it clear that we are talking about container version 2015-10-12 21:52:20 +01:00
Jean-Philippe Roemer bfed40eec4 Docker repository path backward compatibility fix:
- resolve 
- create link to old git repository path: `/home/git/gogs-repository`
2015-10-12 21:28:26 +01:00
Jean-Philippe Roemer 9cba6ff84b Volumed data setup changed to allow
- Volumed subfolder now created up in the ENTRYPOINT script, this way
  they are created before S6 even starts making VOLUME.
- The subfolder will be created during VOLUME creation too as ENTRYPOINT
  script will be run before /bin/true
- SSH Keys will now be created on a single key basis not replying on the
  existence of /data/ssh folder
2015-10-12 18:46:45 +01:00
Jean-Philippe Roemer fc427432ed Docker Container Restart Fix
- Fix s6 fifodir error on container restart
- Add .tags* to .gitignore (Atom auto ctags generation)
2015-10-10 21:03:19 +01:00
Jean-Philippe Roemer 5981f1edcd Remove fixed issue 2015-10-02 23:32:46 +01:00
Jean-Philippe Roemer ad5e0b833c Docker Container: Init 1 & Initialisation
- Now using a setup script before starting the app. The separation of
the run script and the setup script will make service initialisation a
little bit clearer
- Now calling start.sh script as ENTRYPOINT and S6 as CMD. This way
when running the container with just a shell script, the start.sh
script will be launched before, making debugging easier
- Added note about `.dockerignore` ignored during Docker Hub Automated
Build
2015-10-02 23:13:39 +01:00
无闻 e5310cdbc1 Merge pull request from ogarcia/develop
Several bugfixes in Docker build
2015-10-02 15:59:10 -04:00
Unknwon e34d0063c3 Update Docker README for 2015-10-02 15:44:59 -04:00
Óscar García Amor 3e7d8db7a2 Several bugfixes in Docker build
- Removed unnecessary variables
- Fixed symbolic links creation
- Fixed enter point
- Less intermediate containers
2015-10-02 21:18:13 +02:00
Jean-Philippe Roemer 3cad8d9492 Use app/docker folder for SSH Configureation 2015-10-02 11:31:05 +01:00
Jean-Philippe Roemer e63e0b3105 New approach to Gogs Docker Container
- VOLUME for ‘/data’
- Usage of S6 as PID 1 Process
- Usage of ‘socat’ so linked container (like databases) are binded to
localhost
- OpenSSH, Socat Link and Gogs are supervised using S6
- Size of container reduced to ~75Mo
2015-10-02 10:56:36 +01:00
Unknwon 42a38dfca3 improve docs 2015-09-21 10:44:40 -04:00