From dbeb4ceff1a36e3a54530e07c1e498eb3dabcedd Mon Sep 17 00:00:00 2001 From: Davide Polonio Date: Sat, 5 Dec 2020 11:48:47 +0100 Subject: [PATCH 1/4] Add first DroneCi draft --- ci/docker-compose.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 ci/docker-compose.yaml diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml new file mode 100644 index 0000000..68ffab8 --- /dev/null +++ b/ci/docker-compose.yaml @@ -0,0 +1,40 @@ +version: '3.7' + +service: + server: + image: drone/drone:1 + restart: always + env_file: + - env-droneci-server + networks: + - internal + - proxy + volumes: + - ci_server_data:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + + runner: + image: drone/drone-runner-docker:1 + restart: always + env_file: + - env-droneci-runner + networks: + - internal + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - /var/run/docker.sock:/var/run/docker.sock + +volumes: + ci_server_data: + driver: local + driver_opts: + type: none + o: bind + device: "/srv/docker/ci/server_data" + +networks: + internal: {} + proxy: + external: true -- 2.40.1 From 5b42de32b111daea9ef25adc0d6c88495ae4dcbc Mon Sep 17 00:00:00 2001 From: Davide Polonio Date: Sat, 5 Dec 2020 11:17:59 +0000 Subject: [PATCH 2/4] Fix typo --- ci/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml index 68ffab8..1a71333 100644 --- a/ci/docker-compose.yaml +++ b/ci/docker-compose.yaml @@ -1,6 +1,6 @@ version: '3.7' -service: +services: server: image: drone/drone:1 restart: always -- 2.40.1 From ca261a0a7ece3c9c075d4812f4439ccb6b0de3f8 Mon Sep 17 00:00:00 2001 From: Davide Polonio Date: Sat, 5 Dec 2020 12:21:19 +0100 Subject: [PATCH 3/4] Add first Drone-CI integration --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..7c009f4 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,9 @@ +kind: pipeline +type: docker +name: default + +steps: + - name: Lint Check + image: sdesbure/yamllint + commands: + - yamllint **/*.y?ml -- 2.40.1 From da05ae30675b5a8d8799d6d90dfb43a71aac26a9 Mon Sep 17 00:00:00 2001 From: Davide Polonio Date: Sat, 5 Dec 2020 12:31:52 +0100 Subject: [PATCH 4/4] Fix lint issues --- ci/docker-compose.yaml | 1 + git_server/docker-compose.yaml | 2 +- mail/docker-compose.yml | 1 + reverse_proxy/docker-compose.yaml | 1 + terraria/docker-compose.yaml | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/docker-compose.yaml b/ci/docker-compose.yaml index 1a71333..bc7e4bb 100644 --- a/ci/docker-compose.yaml +++ b/ci/docker-compose.yaml @@ -1,3 +1,4 @@ +--- version: '3.7' services: diff --git a/git_server/docker-compose.yaml b/git_server/docker-compose.yaml index 0310e58..5a350de 100644 --- a/git_server/docker-compose.yaml +++ b/git_server/docker-compose.yaml @@ -1,3 +1,4 @@ +--- version: '3.7' services: @@ -45,4 +46,3 @@ networks: proxy: external: true internal: - diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml index 9927030..071ccc1 100644 --- a/mail/docker-compose.yml +++ b/mail/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: '3.7' services: mail: diff --git a/reverse_proxy/docker-compose.yaml b/reverse_proxy/docker-compose.yaml index fe994ea..d4f1e1a 100644 --- a/reverse_proxy/docker-compose.yaml +++ b/reverse_proxy/docker-compose.yaml @@ -1,3 +1,4 @@ +--- version: '3.7' services: nginx: diff --git a/terraria/docker-compose.yaml b/terraria/docker-compose.yaml index 2897b5e..06a9611 100644 --- a/terraria/docker-compose.yaml +++ b/terraria/docker-compose.yaml @@ -1,3 +1,4 @@ +--- version: '3.7' services: -- 2.40.1