diff --git a/.dockerignore b/.dockerignore index 26f98a6..08c917d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ *.yml *.toml +test diff --git a/docker-compose-dind.yml b/docker-compose-dind.yml deleted file mode 100644 index b948a55..0000000 --- a/docker-compose-dind.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3" - -volumes: - docker-certs: - -networks: - cursorius: - -services: - cursorius: - build: - context: . - dockerfile: ./Dockerfile - ports: - - "127.0.0.1:45420:45420" - environment: - - "DOCKER_HOST=tcp://dind:2376" - - "DOCKER_CERT_PATH=/certs/client" - networks: - - cursorius - volumes: - - "./server-dind.toml:/root/.config/cursorius/server.toml" - - docker-certs:/certs/client:ro - - - dind: - image: docker:dind - privileged: true - networks: - - cursorius - environment: - - "DOCKER_TLS_CERTDIR=/certs" - volumes: - - docker-certs:/certs/client diff --git a/docker-compose.yml b/docker-compose.yml index 949f3cf..bbc6cc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,5 +8,4 @@ services: - "0.0.0.0:45420:45420" volumes: - "./server.toml:/root/.config/cursorius/server.toml" - - "/home/robby/development/restitux/ohea/cursorius/test/server/job:/job" - "/var/run/docker.sock:/var/run/docker.sock" diff --git a/test/docker-compose-webhook.yml b/test/docker-compose-webhook.yml new file mode 100644 index 0000000..448ee2b --- /dev/null +++ b/test/docker-compose-webhook.yml @@ -0,0 +1,32 @@ +version: "3.3" +services: + cursorius-server: + build: + context: .. + dockerfile: ./Dockerfile + networks: + - gitea + ports: + - "0.0.0.0:45420:45420" + volumes: + - "../server.toml:/root/.config/cursorius/server.toml" + - "/var/run/docker.sock:/var/run/docker.sock" + gitea: + image: gitea/gitea:latest + environment: + - GITEA__webhook__ALLOWED_HOST_LIST=cursorius-server, external + ports: + - "127.0.0.1:2222:22" + - "127.0.0.1:3000:3000" + networks: + - gitea + volumes: + - gitea-data:/data + + +volumes: + gitea-data: + +networks: + gitea: + external: false diff --git a/test/docker-compose.yml b/test/docker-compose.yml new file mode 100644 index 0000000..949f3cf --- /dev/null +++ b/test/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3.3" +services: + cursorius-server: + build: + context: . + dockerfile: ./Dockerfile + ports: + - "0.0.0.0:45420:45420" + volumes: + - "./server.toml:/root/.config/cursorius/server.toml" + - "/home/robby/development/restitux/ohea/cursorius/test/server/job:/job" + - "/var/run/docker.sock:/var/run/docker.sock"