diff --git a/cleanslate/docker-compose.yml b/cleanslate/docker-compose.yml index adeab70..adc0a7b 100644 --- a/cleanslate/docker-compose.yml +++ b/cleanslate/docker-compose.yml @@ -1,44 +1,44 @@ services: - database: + cleanslate-database: image: postgres:15 restart: always - container_name: database + container_name: cleanslate-database ports: - - '${POSTGRES_PORT:-5432}:5432' + - '35000:5432' environment: - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_PASSWORD: 1234 volumes: - - database:/var/lib/postgresql/data + - cleanslate-database:/var/lib/postgresql/data healthcheck: test: [ 'CMD-SHELL', 'pg_isready -U postgres'] interval: 10s timeout: 5s retries: 5 - graphql-server: + cleanslate-graphql-server: image: hasura/graphql-engine:latest.cli-migrations-v3 restart: always - container_name: graphql-server + container_name: cleanslate-graphql-server ports: - - '${HASURA_PORT:-8080}:8080' + - '35001:8080' environment: HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET} HASURA_GRAPHQL_CORS_DOMAIN: https://${NEXT_PUBLIC_HASURA_DOMAIN} - HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD}@database:5432/postgres + HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD}@cleanslate-database:35000/postgres HASURA_GRAPHQL_DEV_MODE: false HASURA_GRAPHQL_ENABLE_CONSOLE: true HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log HASURA_GRAPHQL_JWT_SECRET: ${HASURA_GRAPHQL_JWT_SECRET} volumes: - - ./migrations:/hasura-migrations - - ./metadata:/hasura-metadata + - cleanslate-migrations:/hasura-migrations + - cleanslate-metadata:/hasura-metadata depends_on: - database: + cleanslate-database: condition: service_healthy extra_hosts: - 'host.docker.internal:host-gateway' - authentication-server: + cleanslate-authentication-server: image: ghcr.io/successible/cleanslate/authentication-server:latest build: context: . @@ -47,18 +47,18 @@ services: restart: always container_name: authentication-server ports: - - '${AUTHENTICATION_SERVER_PORT:-3001}:3001' + - '35002:3001' environment: HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET} JWT_SIGNING_SECRET: ${JWT_SIGNING_SECRET} NEXT_PUBLIC_USE_FIREBASE: ${NEXT_PUBLIC_USE_FIREBASE:-false} depends_on: - - database - - graphql-server + - cleanslate-database + - cleanslate-graphql-server extra_hosts: - 'host.docker.internal:host-gateway' - client: + cleanslate-client: image: ghcr.io/successible/cleanslate/client:latest build: context: . @@ -77,12 +77,14 @@ services: restart: always container_name: client ports: - - '${CLIENT_PORT:-3000}:3000' + - '2010:3000' depends_on: - - database - - graphql-server + - cleanslate-database + - cleanslate-graphql-server extra_hosts: - 'host.docker.internal:host-gateway' volumes: - database: + cleanslate-database: + cleanslate-migrations: + cleanslate-metadata: \ No newline at end of file diff --git a/atomichabits/docker-compose.yml b/released-to-production/atomichabits/docker-compose.yml similarity index 100% rename from atomichabits/docker-compose.yml rename to released-to-production/atomichabits/docker-compose.yml diff --git a/easy-gate/docker-compose.yml b/released-to-production/easy-gate/docker-compose.yml similarity index 100% rename from easy-gate/docker-compose.yml rename to released-to-production/easy-gate/docker-compose.yml diff --git a/easy-gate/easy-gate.json b/released-to-production/easy-gate/easy-gate.json similarity index 93% rename from easy-gate/easy-gate.json rename to released-to-production/easy-gate/easy-gate.json index 5a24555..52f3236 100644 --- a/easy-gate/easy-gate.json +++ b/released-to-production/easy-gate/easy-gate.json @@ -45,6 +45,11 @@ "category": "", "url": "http://tsys1:2006", }, + { + "name": "Reactive Resume", + "category": "", + "url": "http://tsys1:2007", + }, { "name": "Atomic Habits", "category": "", diff --git a/reactive-resume/docker-compose.yml b/released-to-production/reactive-resume/docker-compose.yml similarity index 98% rename from reactive-resume/docker-compose.yml rename to released-to-production/reactive-resume/docker-compose.yml index e867940..e79b68f 100644 --- a/reactive-resume/docker-compose.yml +++ b/released-to-production/reactive-resume/docker-compose.yml @@ -24,7 +24,7 @@ services: # Storage (for image uploads) reactiveresume-minio: image: minio/minio - container_name: tsys-reactivereusme-minio + container_name: tsys-reactiveresume-minio restart: unless-stopped command: server /data ports: diff --git a/released-to-production/tube-archivist/docker-compose.yml b/released-to-production/tube-archivist/docker-compose.yml new file mode 100644 index 0000000..0945cd1 --- /dev/null +++ b/released-to-production/tube-archivist/docker-compose.yml @@ -0,0 +1,63 @@ +services: + tubearchivist: + container_name: tubearchivist + restart: unless-stopped + image: bbilly1/tubearchivist + ports: + - 2004:8000 + volumes: + - tubearchivist-media:/youtube + - tubearchivist-cache:/cache + environment: + - ES_URL=http://tubearchivist-es:9200 # needs protocol e.g. http and port + - REDIS_HOST=tubearchivist-redis # don't add protocol + - HOST_UID=1000 + - HOST_GID=1000 + - TA_HOST=tsys1 # set your host name + - TA_USERNAME=tubearchivist # your initial TA credentials + - TA_PASSWORD=verysecret # your initial TA credentials + - ELASTIC_PASSWORD=verysecret # set password for Elasticsearch + - TZ=America/Chicago # set your time zone + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:2004/health"] + interval: 2m + timeout: 10s + retries: 3 + start_period: 30s + depends_on: + - tubearchivist-es + - tubearchivist-redis + tubearchivist-redis: + image: redis/redis-stack-server + container_name: tubearchivist-redis + restart: unless-stopped + expose: + - "6379" + volumes: + - tubearchivist-redis:/data + depends_on: + - tubearchivist-es + tubearchivist-es: + image: bbilly1/tubearchivist-es # only for amd64, or use official es 8.14.3 + container_name: tubearchivist-es + restart: unless-stopped + environment: + - "ELASTIC_PASSWORD=verysecret" # matching Elasticsearch password + - "ES_JAVA_OPTS=-Xms1g -Xmx1g" + - "xpack.security.enabled=true" + - "discovery.type=single-node" + - "path.repo=/usr/share/elasticsearch/data/snapshot" + ulimits: + memlock: + soft: -1 + hard: -1 + volumes: + - tubearchivist-es:/usr/share/elasticsearch/data # check for permission error when using bind mount, see readme + expose: + - "9200" + +volumes: + tubearchivist-media: + tubearchivist-cache: + tubearchivist-redis: + tubearchivist-es: \ No newline at end of file diff --git a/vscode-server/docker-compose.yml b/released-to-production/vscode-server/docker-compose.yml similarity index 100% rename from vscode-server/docker-compose.yml rename to released-to-production/vscode-server/docker-compose.yml diff --git a/wakaapi/docker-compose.yml b/released-to-production/wakaapi/docker-compose.yml similarity index 100% rename from wakaapi/docker-compose.yml rename to released-to-production/wakaapi/docker-compose.yml diff --git a/resume-matcher/docker-compose.yml b/resume-matcher/docker-compose.yml new file mode 100644 index 0000000..5cda386 --- /dev/null +++ b/resume-matcher/docker-compose.yml @@ -0,0 +1,8 @@ +services: + resume-matcher: + image : resume-matcher + build: + context: ./ + dockerfile : build.dockerfile + ports: + - 80:8501 diff --git a/wael/docker-compose.yml b/wael/docker-compose.yml deleted file mode 100644 index 584934c..0000000 --- a/wael/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -services: - wael: - container_name: reachableceo-wael - image: reachableceo-wael:latest # increment this number (or set the env value in your .env) to force portainer to rebuild the image https://github.com/portainer/portainer/issues/6288 - restart: always - ports: - - "2009:3009" # Must be supplied by shell or in .env file - env_file: - - ./wael.env - volumes: - - "${HOST_DATA_PATH:-/default/path}:/workspace/prisma/data" # Must be supplied by shell or in .env file - user: node diff --git a/wael/wael.env b/wael/wael.env deleted file mode 100644 index f0802ee..0000000 --- a/wael/wael.env +++ /dev/null @@ -1,5 +0,0 @@ -TZ=America/Chicago -DOCKER_IMAGE_TAG=v2 -HOST_DATA_PATH="D:/tsys/docker/volumes/reachableceo-wael-data/" -EXPOSE_PRISMA_STUDIO=false -PRISMA_STUDIO_PORT=5533 \ No newline at end of file diff --git a/wger/config/nginx.conf b/wger/config/nginx.conf new file mode 100644 index 0000000..eb137b2 --- /dev/null +++ b/wger/config/nginx.conf @@ -0,0 +1,28 @@ +upstream wger { + server wger-web:2003; +} + +server { + + listen 80; + + location / { + proxy_pass http://wger; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; + proxy_set_header X-Forwarded-Host $host:$server_port; + proxy_redirect off; + } + + location /static/ { + alias /wger/static/; + } + + location /media/ { + alias /wger/media/; + } + + # Increase max body size to allow for video uploads + client_max_body_size 100M; +} diff --git a/wger/docker-compose.yml b/wger/docker-compose.yml index 78ae18d..c0c1037 100644 --- a/wger/docker-compose.yml +++ b/wger/docker-compose.yml @@ -1,4 +1,3 @@ -# # Please consult the `Deployment` section in the readme if you want to deploy # this. You *need* to keep this nginx service, even if you have your own, # otherwise the static files will not be served correctly! If you do remove @@ -6,35 +5,35 @@ # Also take a look at the "Static files" section in the .env file services: - web: + wger-web: image: wger/server:latest depends_on: - db: + wger-db: condition: service_healthy - cache: + wger-cache: condition: service_healthy - env_file: - - ./config/prod.env + #env_file: + # - ./config/prod.env volumes: - - static:/home/wger/static + - wger-static:/home/wger/static expose: - - 8000 + - 2003 healthcheck: - test: wget --no-verbose --tries=1 --spider http://localhost:2003 + test: wget --no-verbose --tries=1 --spider http://localhost:8000 interval: 10s timeout: 5s start_period: 300s retries: 5 restart: unless-stopped - nginx: + wger-nginx: image: nginx:stable depends_on: - - web + - wger-web volumes: - ./config/nginx.conf:/etc/nginx/conf.d/default.conf - - static:/wger/static:ro - - media:/wger/media:ro + - wger-static:/wger/static:ro + - wger-media:/wger/media:ro ports: - "80:80" healthcheck: @@ -45,14 +44,14 @@ services: start_period: 30s restart: unless-stopped - db: + wger-db: image: postgres:15-alpine environment: - POSTGRES_USER=wger - POSTGRES_PASSWORD=wger - POSTGRES_DB=wger -# volumes: -# - postgres-data:/var/lib/postgresql/data/ + volumes: + - wger-postgres-data:/var/lib/postgresql/data/ expose: - 5432 healthcheck: @@ -63,12 +62,12 @@ services: start_period: 30s restart: unless-stopped - cache: - image: redis + wger-cache: + image: redis:latest expose: - 6379 volumes: - - redis-data:/data + - wger-redis-data:/data healthcheck: test: redis-cli ping interval: 10s @@ -77,15 +76,15 @@ services: start_period: 30s restart: unless-stopped - celery_worker: + wger-celery_worker: image: wger/server:latest command: /start-worker - env_file: - - ./config/prod.env + #env_file: + # - ./config/prod.env volumes: - - media:/home/wger/media + - wger-media:/home/wger/media depends_on: - web: + wger-web: condition: service_healthy healthcheck: test: celery -A wger inspect ping @@ -94,24 +93,24 @@ services: retries: 5 start_period: 30s - celery_beat: + wger-celery_beat: image: wger/server:latest command: /start-beat volumes: - - celery-beat:/home/wger/beat/ - env_file: - - ./config/prod.env + - wger-celery-beat:/home/wger/beat/ + #env_file: + # - ./config/prod.env depends_on: - celery_worker: + wger-celery_worker: condition: service_healthy volumes: - postgres-data: - celery-beat: - static: - media: - redis-data: + wger-postgres-data: + wger-celery-beat: + wger-static: + wger-media: + wger-redis-data: networks: default: - name: wger_network + name: wger_network \ No newline at end of file diff --git a/wger/update.sh b/wger/update.sh new file mode 100644 index 0000000..08a9183 --- /dev/null +++ b/wger/update.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +#docker compose exec wger-web python3 manage.py sync-exercises +docker compose exec wger-web python3 manage.py download-exercise-images +docker compose exec wger-web python3 manage.py download-exercise-videos + +docker compose exec wger-web wger load-online-fixtures +# afterwards: +docker compose exec wger-web python3 manage.py sync-ingredients