diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b9c1bb7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +docker-data diff --git a/README.md b/README.md index c246311..e79ccf4 100644 --- a/README.md +++ b/README.md @@ -3,19 +3,26 @@ Set of tools inside Docker containers, using docker-compose. ### Current tools -- [x] gitlab / gogs (https://gogs.io/) / gitea (https://gitea.io) +- [x] git + - [ ] gitlab + - [x] gogs (https://gogs.io/) + - [x] gitea (https://gitea.io) - [x] kanboard (https://kanboard.org/) - [x] mumble (murmur) (https://www.mumble.com/) -- [ ] etherpad (http://etherpad.org/) / cryptopad +- [ ] collaborative pads + - [ ] etherpad (http://etherpad.org/) + - [ ] cryptopad - [ ] nextcloud - [x] dudle (https://github.com/kellerben/dudle/) -- [ ] matrix/rocketchat -- [ ] draw.io +- [ ] chat + - [ ] matrix + - [ ] rocketchat +- [x] draw.io Run with ``` -POSTGRES_USER=user1 POSTGRES_PASSWORD=user1 docker-compose up +docker-compose up ``` Ports: @@ -29,6 +36,10 @@ Ports: - 4002 - dudle - 4003 +- draw + - 4004 +- gitea + - 4005 In the directory /launcher there is a webapp with links to all the services. diff --git a/docker-compose.yml b/docker-compose.yml index b0c13b2..4ffe6eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,14 +15,32 @@ services: image: postgres:9.5 restart: always environment: - - "POSTGRES_USER=${POSTGRES_USER}" - - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" + - "POSTGRES_USER=user1" + - "POSTGRES_PASSWORD=user1" - "POSTGRES_DB=gogs" + - "POSTGRES_DB=gitea" - "POSTGRES_DB=pad" volumes: - "db-data:/var/lib/postgresql/data" networks: - gogs + - gitea + + gitea: + image: gitea/gitea:latest + environment: + - USER_UID=1000 + - USER_GID=1000 + restart: always + networks: + - gitea + volumes: + - ./docker-data/gitea:/data + ports: + - "4005:3000" + - "222:22" + depends_on: + - postgres gogs: image: gogs/gogs:latest @@ -37,7 +55,7 @@ services: networks: - gogs volumes: - - "gogs-data:/data" + - ./docker-data/gogs-data:/data depends_on: - postgres @@ -54,15 +72,29 @@ services: ports: - "4003:80" + # draw: + # build: ./draw + # restart: always + # ports: + # - "4004:8080" + draw: + image: fjudith/draw.io + restart: always + ports: + - "4004:8443" + launcher: - build: ./launcher - ports: - - "8080:8080" + build: ./launcher + restart: always + ports: + - "8080:8080" networks: gogs: driver: bridge + gitea: + driver: bridge volumes: kanboard_data: diff --git a/launcher/img/draw.png b/launcher/img/draw.png new file mode 100644 index 0000000..d3444e3 Binary files /dev/null and b/launcher/img/draw.png differ diff --git a/launcher/img/gitea.png b/launcher/img/gitea.png new file mode 100644 index 0000000..dd3e97c Binary files /dev/null and b/launcher/img/gitea.png differ diff --git a/launcher/img/launcher.png b/launcher/img/launcher.png new file mode 100644 index 0000000..42e8375 Binary files /dev/null and b/launcher/img/launcher.png differ diff --git a/launcher/index.html b/launcher/index.html index 4b61c9b..21f3f52 100644 --- a/launcher/index.html +++ b/launcher/index.html @@ -5,7 +5,7 @@ - + @@ -15,7 +15,10 @@

@@ -25,30 +28,40 @@
+
+ nextcloud
+
+ + draw + +