diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7762c4a..a66fc40 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -25,5 +25,16 @@ services: context: ./docker/mariadb dockerfile: Dockerfile.staging image: git.nixc.us/nixius/template:staging-mariadb + environment: + - MARIADB_ROOT_PASSWORD=secret + - MARIADB_DATABASE=easyappointments networks: - - dev_network \ No newline at end of file + - dev_network + volumes: + - mariadb_data:/var/lib/mysql + +networks: + dev_network: + +volumes: + mariadb_data: \ No newline at end of file diff --git a/stack.production.yml b/stack.production.yml index 67f8e22..7ca6d7b 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -5,7 +5,7 @@ networks: services: easy-appointments: - image: git.nixc.us/nixius/easy-appointments:production + image: git.nixc.us/colin/easy-appointments:production deploy: replicas: 1 restart_policy: @@ -19,6 +19,13 @@ services: parallelism: 1 delay: 10s order: stop-first + environment: + BASE_URL: "https://easy-appointments.colinknapp.com" + DEBUG_MODE: "FALSE" + DB_HOST: "mariadb" + DB_NAME: "easyappointments" + DB_USERNAME: "root" + DB_PASSWORD: "secret" networks: - traefik - default @@ -35,7 +42,7 @@ services: - traefik.http.routers.production_easy-appointments.middlewares=secure-headers mariadb: - image: git.nixc.us/nixius/mariadb:production + image: git.nixc.us/colin/easy-appointments:production-mariadb deploy: replicas: 1 restart_policy: @@ -54,3 +61,6 @@ services: retries: 5 start_period: 30s timeout: 5s + +volumes: + mariadb_data: diff --git a/stack.staging.yml b/stack.staging.yml index 7175df0..8cdd0bb 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -4,8 +4,8 @@ networks: default: services: - template: - image: git.nixc.us/nixius/easy-appointments:staging + easy-appointments: + image: git.nixc.us/colin/easy-appointments:staging deploy: replicas: 1 restart_policy: @@ -38,7 +38,7 @@ services: - traefik.http.services.staging_easy-appointments.loadbalancer.server.port=80 mariadb: - image: git.nixc.us/nixius/easy-appointments:staging-mariadb + image: git.nixc.us/colin/easy-appointments:staging-mariadb deploy: replicas: 1 restart_policy: diff --git a/temp/build-test-run.log b/temp/build-test-run.log index b180759..14bffa0 100644 --- a/temp/build-test-run.log +++ b/temp/build-test-run.log @@ -1,206 +1,3 @@ -Build started at Wed Apr 23 10:57:52 EDT 2025 +Build started at Wed Apr 23 11:13:22 EDT 2025 Building Docker images... -#0 building with "desktop-linux" instance using docker driver - -#1 [mariadb internal] load build definition from Dockerfile.staging -#1 transferring dockerfile: 100B done -#1 DONE 0.0s - -#2 [template internal] load build definition from Dockerfile.staging -#2 transferring dockerfile: 287B done -#2 DONE 0.0s - -#3 [mariadb internal] load metadata for docker.io/library/mariadb:10.5 -#3 ... - -#4 [template internal] load metadata for docker.io/library/alpine:3.18 -#4 DONE 0.6s - -#5 [template internal] load .dockerignore -#5 transferring context: 2B done -#5 DONE 0.0s - -#6 [template 1/3] FROM docker.io/library/alpine:3.18@sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f -#6 resolve docker.io/library/alpine:3.18@sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f done -#6 DONE 0.0s - -#7 [template 2/3] RUN mkdir -p /scratch /temp -#7 CACHED - -#8 [template 3/3] WORKDIR /scratch -#8 CACHED - -#9 [template] exporting to image -#9 exporting layers done -#9 exporting manifest sha256:df84d578a4eccddc7f7d15d3c610d35803bd529ce0f90f1eb1099bbf982d9341 done -#9 exporting config sha256:c48b4c75f46025fb4e6a7ba120f44c3a0f8bb216a3724a138aacaac8bdb20d79 done -#9 exporting attestation manifest sha256:475763fe07bd398483134834afcb34d685d06091f193097a8de2d084172d70a6 done -#9 exporting manifest list sha256:9a5d2937d479459aab9d19d0462b88f6806c5129a4fd5cb1d91e0f593d99c7f1 done -#9 naming to docker.io/library/template:dev done -#9 unpacking to docker.io/library/template:dev done -#9 DONE 0.0s - -#10 [template] resolving provenance for metadata file -#10 DONE 0.0s - -#3 [mariadb internal] load metadata for docker.io/library/mariadb:10.5 -#3 DONE 1.0s - -#11 [mariadb internal] load .dockerignore -#11 transferring context: 2B done -#11 DONE 0.0s - -#12 [mariadb] exporting to image -#12 exporting layers done -#12 exporting manifest sha256:67ef4d7011fcf8bda1b124dc9f2017e9cd24ffc75c81a44f5ee8dfc4f5e97272 done -#12 exporting config sha256:812d99d7ea8dc6b118c8a744483eab5b3e5fbb0380aed0f65ba822532f413754 done -#12 exporting attestation manifest sha256:0b5426886d81a60ddf543fb55b3c7007c9a127d2f4322cb2fb92518f2517529e done -#12 exporting manifest list sha256:4885a79a2416052a698a924d667c301d0fda6430e0743a452fb21b49626c5253 done -#12 naming to git.nixc.us/nixius/template:staging-mariadb done -#12 unpacking to git.nixc.us/nixius/template:staging-mariadb -#12 ... - -#13 [mariadb 1/1] FROM docker.io/library/mariadb:10.5@sha256:c8bb76c7d0fd384a8a9f230c42a879be8e1052783c8007caa1320a630273b425 -#13 resolve docker.io/library/mariadb:10.5@sha256:c8bb76c7d0fd384a8a9f230c42a879be8e1052783c8007caa1320a630273b425 done -#13 sha256:2cee1b6df15e88df102c5a223517324a6528295d0fb6e19c5161825fe763f69e 6.92MB / 6.92MB 1.4s done -#13 sha256:ecd83b6c354452b6a9979c7666bba16927f1e60e2afbfe6401dd6f87d5db8576 25.98MB / 25.98MB 5.2s done -#13 sha256:e3cdbb02b6a886f3813579a158ede3a5b1edd7dcb1c52e6c59743f657f948034 334B / 334B 0.3s done -#13 sha256:8f6b9b5adf18f48eb3699fa43002dfad0723983c62b66e3698060d0c1da2bcd8 4.02kB / 4.02kB 0.2s done -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 32.51MB / 85.28MB 5.6s -#13 sha256:8d4f5f48dd26314ce01174c43bd9ae56dadc8839986fd1138b3e083a1d3a3312 116B / 116B 0.1s done -#13 sha256:6cf7fc23f330d664ea3c8441ee3d59eb9027dca82959097e60df44d7bb1c3190 8.20kB / 8.20kB 0.1s done -#13 sha256:40586c3e1976d254ac7d41b1267009de3ccf1974e5ad3896618b398882e8fce9 1.72kB / 1.72kB 0.1s done -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 37.75MB / 85.28MB 6.0s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 42.99MB / 85.28MB 6.5s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 48.23MB / 85.28MB 6.9s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 53.48MB / 85.28MB 7.4s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 58.72MB / 85.28MB 7.8s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 63.96MB / 85.28MB 8.3s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 69.21MB / 85.28MB 8.7s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 74.45MB / 85.28MB 9.2s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 79.69MB / 85.28MB 9.6s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 85.28MB / 85.28MB 10.1s -#13 sha256:95ffc3e5b4d502bbde11dfaae453c4f0ece489a095d5518eed9a24d70c32d369 85.28MB / 85.28MB 10.1s done -#13 DONE 10.3s - -#12 [mariadb] exporting to image -#12 unpacking to git.nixc.us/nixius/template:staging-mariadb 13.8s done -#12 DONE 13.9s - -#14 [mariadb] resolving provenance for metadata file -#14 DONE 0.0s - mariadb Built - template Built -Running tests... -Running tests... -Test results have been saved to ./temp/test_output.log -Test started at Wed Apr 23 10:58:08 EDT 2025 -Testing Docker build... -#0 building with "desktop-linux" instance using docker driver - -#1 [mariadb internal] load build definition from Dockerfile.staging -#1 transferring dockerfile: 100B done -#1 DONE 0.0s - -#2 [template internal] load build definition from Dockerfile.staging -#2 transferring dockerfile: 287B done -#2 DONE 0.0s - -#3 [template internal] load metadata for docker.io/library/alpine:3.18 -#3 ... - -#4 [mariadb internal] load metadata for docker.io/library/mariadb:10.5 -#4 DONE 0.3s - -#5 [mariadb internal] load .dockerignore -#5 transferring context: 2B done -#5 DONE 0.0s - -#6 [mariadb 1/1] FROM docker.io/library/mariadb:10.5@sha256:c8bb76c7d0fd384a8a9f230c42a879be8e1052783c8007caa1320a630273b425 -#6 resolve docker.io/library/mariadb:10.5@sha256:c8bb76c7d0fd384a8a9f230c42a879be8e1052783c8007caa1320a630273b425 done -#6 CACHED - -#7 [mariadb] exporting to image -#7 exporting layers done -#7 exporting manifest sha256:67ef4d7011fcf8bda1b124dc9f2017e9cd24ffc75c81a44f5ee8dfc4f5e97272 done -#7 exporting config sha256:812d99d7ea8dc6b118c8a744483eab5b3e5fbb0380aed0f65ba822532f413754 done -#7 exporting attestation manifest sha256:7aca870e0ff4f86c1fa6d851de62930967f801fb0ab78b125b90b881a1902d77 0.0s done -#7 exporting manifest list sha256:d4ed6fde413437ace9621431c6eb2a01a2e697f76f9eb75bfd8867d854ed0329 done -#7 naming to git.nixc.us/nixius/template:staging-mariadb done -#7 unpacking to git.nixc.us/nixius/template:staging-mariadb done -#7 DONE 0.1s - -#8 [mariadb] resolving provenance for metadata file -#8 DONE 0.0s - -#3 [template internal] load metadata for docker.io/library/alpine:3.18 -#3 DONE 0.5s - -#9 [template internal] load .dockerignore -#9 transferring context: 2B done -#9 DONE 0.0s - -#10 [template 1/3] FROM docker.io/library/alpine:3.18@sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f -#10 resolve docker.io/library/alpine:3.18@sha256:de0eb0b3f2a47ba1eb89389859a9bd88b28e82f5826b6969ad604979713c2d4f 0.0s done -#10 DONE 0.0s - -#11 [template 2/3] RUN mkdir -p /scratch /temp -#11 CACHED - -#12 [template 3/3] WORKDIR /scratch -#12 CACHED - -#13 [template] exporting to image -#13 exporting layers done -#13 exporting manifest sha256:df84d578a4eccddc7f7d15d3c610d35803bd529ce0f90f1eb1099bbf982d9341 done -#13 exporting config sha256:c48b4c75f46025fb4e6a7ba120f44c3a0f8bb216a3724a138aacaac8bdb20d79 done -#13 exporting attestation manifest sha256:9019fbf8cbfc0b2044e242e9ec9dbdb71d7cc56fcaf67b83f0f5f52f9004db31 done -#13 exporting manifest list sha256:cae7893861af71be867d14ed053aaa6dab448b864649480d90264a3522d580bd done -#13 naming to docker.io/library/template:test done -#13 unpacking to docker.io/library/template:test done -#13 DONE 0.0s - -#14 [template] resolving provenance for metadata file -#14 DONE 0.0s - mariadb Built - template Built -Testing container startup... - Network easy-appointments_default Creating - Network easy-appointments_default Created - Container easy-appointments-mariadb-1 Creating - Container easy-appointments-template-1 Creating - Container easy-appointments-template-1 Created - Container easy-appointments-mariadb-1 Created - Container easy-appointments-mariadb-1 Starting - Container easy-appointments-template-1 Starting - Container easy-appointments-mariadb-1 Started - Container easy-appointments-template-1 Started -Container status: -NAME IMAGE COMMAND SERVICE CREATED STATUS PORTS -easy-appointments-template-1 template:test "tail -f /dev/null" template 6 seconds ago Up 5 seconds -Cleaning up... - Container easy-appointments-template-1 Stopping - Container easy-appointments-mariadb-1 Stopping - Container easy-appointments-mariadb-1 Stopped - Container easy-appointments-mariadb-1 Removing - Container easy-appointments-mariadb-1 Removed - Container easy-appointments-template-1 Stopped - Container easy-appointments-template-1 Removing - Container easy-appointments-template-1 Removed - Network easy-appointments_default Removing - Network easy-appointments_default Removed -Tests completed at Wed Apr 23 10:58:27 EDT 2025 -Starting services... - Network easy-appointments_dev_network Creating - Network easy-appointments_dev_network Created - Volume "easy-appointments_mariadb_data" Creating - Volume "easy-appointments_mariadb_data" Created - Container easy-appointments-template-1 Creating - Container easy-appointments-mariadb-1 Creating - Container easy-appointments-template-1 Created - Container easy-appointments-mariadb-1 Created - Container easy-appointments-template-1 Starting - Container easy-appointments-mariadb-1 Starting - Container easy-appointments-mariadb-1 Started - Container easy-appointments-template-1 Started -Build and run completed at Wed Apr 23 10:58:31 EDT 2025 +service "mariadb" refers to undefined network dev_network: invalid compose project