This commit is contained in:
Colin 2024-05-13 10:29:43 -04:00
parent 9e6a189519
commit ab4068fd4d
15 changed files with 105 additions and 159 deletions

View File

@ -4,9 +4,9 @@ services:
build:
context: docker/redis
dockerfile: Dockerfile.production
image: git.nixc.us/colin/haste:production-redis
haste:
image: git.nixc.us/nixius/sofd:production-redis
opensearch:
build:
context: docker/haste
context: docker/opensearch
dockerfile: Dockerfile.production
image: git.nixc.us/colin/haste:production-haste
image: git.nixc.us/nixius/sofd:production-opensearch

View File

@ -1,10 +1,17 @@
version: "3.9"
services:
redis:
fluentd:
build:
context: docker/redis
image: git.nixc.us/colin/haste:staging-redis
haste:
context: docker/fluentd
dockerfile: Dockerfile
image: git.nixc.us/nixius/sofd:staging-fluentd
opensearch:
build:
context: docker/haste
image: git.nixc.us/colin/haste:staging-haste
context: docker/opensearch
dockerfile: Dockerfile
image: git.nixc.us/nixius/sofd:staging-opensearch
opensearch-dashboards:
build:
context: docker/opensearch-dashboards
dockerfile: Dockerfile
image: git.nixc.us/nixius/sofd:staging-opensearch-dashboards

View File

@ -1,18 +0,0 @@
version: '3'
services:
app:
image: git.nixc.us/colin/haste:haste-staging
environment:
TEST_MODE: "true"
STORAGE_TYPE: "redis"
STORAGE_HOST: "redis"
depends_on:
- redis
networks:
- haste-test
redis:
image: redis
networks:
- haste-test
networks:
haste-test:

View File

@ -0,0 +1 @@
FROM fluent/fluentd:v1.14.6

View File

@ -0,0 +1 @@
FROM git.nixc.us/nixius/sofd:staging-fluentd

View File

@ -1,13 +0,0 @@
FROM node:6-alpine as builder
RUN apk add --no-cache git
RUN git clone --depth 1 https://git.nixc.us/Nixius/hastebin.git /app
WORKDIR /app
RUN npm install --production
RUN chmod +x app.sh
FROM node:6-alpine
WORKDIR /app
COPY --from=builder /app .
RUN npm install --production
RUN npm install mocha
CMD ["/app/app.sh"]

View File

@ -1 +0,0 @@
FROM git.nixc.us/colin/haste:staging-haste

View File

@ -0,0 +1 @@
FROM opensearchproject/opensearch-dashboards:2.4.0

View File

@ -0,0 +1 @@
FROM git.nixc.us/nixius/sofd:staging-opensearch-dashboards

View File

@ -0,0 +1 @@
FROM opensearchproject/opensearch:2.4.0

View File

@ -0,0 +1 @@
FROM git.nixc.us/nixius/sofd:staging-opensearch

View File

@ -1 +0,0 @@
FROM eqalpha/keydb

View File

@ -1 +0,0 @@
FROM git.nixc.us/colin/haste:staging-redis

View File

@ -1,58 +1,45 @@
version: '3.8'
services:
redis:
image: git.nixc.us/colin/haste:production-redis
volumes:
- redis_data:/data
networks:
- default
deploy:
placement:
constraints:
- node.hostname == macmini3
replicas: 1
restart_policy:
condition: on-failure
haste:
image: git.nixc.us/colin/haste:production-haste
volumes:
- public_system:/haste/public/system
networks:
- traefik
- default
deploy:
placement:
constraints:
- node.hostname == macmini3
labels:
homepage.group: apps
homepage.name: HasteBin
homepage.href: https://haste.nixc.us/
homepage.description: HasteBin
us.nixc.autodeploy: "true"
traefik.enable: "true"
traefik.http.routers.production-haste_haste.rule: "Host(`haste.nixc.us`)"
traefik.http.routers.production-haste_haste.entrypoints: "websecure"
traefik.http.routers.production-haste_haste.tls: "true"
traefik.http.routers.production-haste_haste.tls.certresolver: "letsencryptresolver"
traefik.http.routers.production-haste_haste.service: "production-haste_haste"
traefik.http.services.production-haste_haste.loadbalancer.server.port: "7777"
traefik.docker.network: "traefik"
replicas: 1
restart_policy:
condition: on-failure
version: "3.7"
networks:
traefik:
external: true
default:
driver: overlay
sofd-net:
volumes:
public_system:
driver: local
redis_data:
driver: local
services:
opensearch:
image: git.nixc.us/nixius/sofd:production-opensearch
environment:
cluster.name: "opensearch"
network.host: "0.0.0.0"
node.name: "opensearch"
discovery.type: "single-node"
bootstrap.memory_lock: "false"
ES_JAVA_OPTS: "-Xms1g -Xmx1g"
OPENSEARCH_INITIAL_ADMIN_PASSWORD: "PzGRamsPfmYkv2yBvcuB7xfzdpZhwMCcx"
# volumes:
# - opensearch-data1:/usr/share/elasticsearch/data
networks:
- sofd-net
fluentd:
image: git.nixc.us/nixius/sofd:production-fluentd
environment:
FLUENTD_CONF: fluent.conf
# volumes:
# - ./fluentd/conf:/fluentd/etc
ports:
- "9880:9880"
networks:
- sofd-net
depends_on:
- opensearch
opensearch-dashboards:
image: git.nixc.us/nixius/sofd:production-opensearch-dashboards
environment:
OPENSEARCH_HOSTS: "http://opensearch:9200"
OPENSEARCH_USERNAME: "admin"
OPENSEARCH_PASSWORD: "PzGRamsPfmYkv2yBvcuB7xfzdpZhwMCcx"
networks:
- sofd-net
depends_on:
- opensearch

View File

@ -1,64 +1,44 @@
version: '3.8'
services:
redis:
image: git.nixc.us/colin/haste:staging-redis
# volumes:
# - redis_data:/data
networks:
- default
deploy:
# placement:
# constraints:
# - node.hostname == macmini3
replicas: 1
restart_policy:
condition: on-failure
haste:
image: git.nixc.us/colin/haste:staging-haste
# volumes:
# - public_system:/haste/public/system
networks:
- traefik
- default
environment:
HOST: "0.0.0.0"
PORT: "7777"
KEY_LENGTH: "10"
MAX_LENGTH: "400000"
STATIC_MAX_AGE: "7776000"
RECOMPRESS_STATIC_ASSETS: "true"
LOGGING_LEVEL: "verbose"
LOGGING_TYPE: "Console"
LOGGING_COLORIZE: "false"
KEY_GENERATOR_TYPE: "phonetic"
STORAGE_TYPE: "redis"
STORAGE_PATH: "./data"
STORAGE_HOST: "haste-staging_redis"
STORAGE_PORT: "6379"
STORAGE_DB: "2"
STORAGE_EXPIRE: "2592000"
deploy:
# placement:
# constraints:
# - node.hostname == macmini3
labels:
us.nixc.autodeploy: "true"
traefik.enable: "true"
traefik.http.routers.staging-haste_haste.rule: "Host(`staging.haste.nixc.us`)"
traefik.http.routers.staging-haste_haste.entrypoints: "websecure"
traefik.http.routers.staging-haste_haste.tls: "true"
traefik.http.routers.staging-haste_haste.tls.certresolver: "letsencryptresolver"
traefik.http.routers.staging-haste_haste.service: "staging-haste_haste"
traefik.http.services.staging-haste_haste.loadbalancer.server.port: "7777"
traefik.docker.network: "traefik"
replicas: 1
restart_policy:
condition: on-failure
version: "3.7"
networks:
traefik:
external: true
default:
driver: overlay
sofd-net:
services:
opensearch:
image: git.nixc.us/nixius/sofd:staging-opensearch
environment:
cluster.name: "opensearch"
network.host: "0.0.0.0"
node.name: "opensearch"
discovery.type: "single-node"
bootstrap.memory_lock: "false"
ES_JAVA_OPTS: "-Xms1g -Xmx1g"
OPENSEARCH_INITIAL_ADMIN_PASSWORD: "PzGRamsPfmYkv2yBvcuB7xfzdpZhwMCcx"
# volumes:
# - opensearch-data1:/usr/share/elasticsearch/data
networks:
- sofd-net
fluentd:
image: git.nixc.us/nixius/sofd:staging-fluentd
environment:
FLUENTD_CONF: fluent.conf
# volumes:
# - ./fluentd/conf:/fluentd/etc
ports:
- "9880:9880"
networks:
- sofd-net
depends_on:
- opensearch
opensearch-dashboards:
image: git.nixc.us/nixius/sofd:staging-opensearch-dashboards
environment:
OPENSEARCH_HOSTS: "http://opensearch:9200"
OPENSEARCH_USERNAME: "admin"
OPENSEARCH_PASSWORD: "PzGRamsPfmYkv2yBvcuB7xfzdpZhwMCcx"
networks:
- sofd-net
depends_on:
- opensearch