From 7ee5bfec1babe05d85a33696ea6380bf82cda12f Mon Sep 17 00:00:00 2001 From: GeorgeWebberley Date: Mon, 26 Jan 2026 09:54:20 +0100 Subject: [PATCH] Preoaring for CI to personal server --- .woodpecker.yaml | 35 ++++++++++++++++++++++++ README.md | 3 +- docker-compose.yaml | 2 +- site/surveyapp/templates/main/index.html | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 .woodpecker.yaml diff --git a/.woodpecker.yaml b/.woodpecker.yaml new file mode 100644 index 0000000..fff03fd --- /dev/null +++ b/.woodpecker.yaml @@ -0,0 +1,35 @@ +when: + event: [push] + branch: main + +steps: + build-and-push: + image: woodpeckerci/plugin-docker-buildx + privileged: true + settings: + platforms: linux/amd64 + registry: git.georgew.dev + repo: git.georgew.dev/georgew/datasaur + tags: + - ${CI_COMMIT_SHA:0:7} + dockerfile: Dockerfile + username: + from_secret: FORGEJO_USER + password: + from_secret: FORGEJO_TOKEN + + deploy: + image: docker:28-cli + privileged: true + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /home/george/datasaur:/home/george/datasaur + environment: + FORGEJO_USER: + from_secret: FORGEJO_USER + FORGEJO_TOKEN: + from_secret: FORGEJO_TOKEN + commands: + - echo $FORGEJO_TOKEN | docker login git.georgew.dev -u $FORGEJO_USER --password-stdin + - docker pull git.georgew.dev/georgew/datasaur:latest + - docker compose -p datasaur -f /home/george/datasaur/docker-compose.yaml up -d --force-recreate \ No newline at end of file diff --git a/README.md b/README.md index f62aa61..337bb0f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# surveyApp +# Datasaur A web application to aid non-experts in processing their survey data through creating data visualisations and carrying out statistical tests. * [Documentation](./documentation.md) -* [Project Journal](./journal.md) diff --git a/docker-compose.yaml b/docker-compose.yaml index d56e408..79a8450 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ version: '3.8' services: web: - build: . + image: git.georgew.dev/georgew/datasaur:latest container_name: surveyapp-web restart: always env_file: diff --git a/site/surveyapp/templates/main/index.html b/site/surveyapp/templates/main/index.html index 53bad5b..6624b38 100644 --- a/site/surveyapp/templates/main/index.html +++ b/site/surveyapp/templates/main/index.html @@ -12,7 +12,7 @@