From 9049d0f410717e2b554f355352761e35ceefbe69 Mon Sep 17 00:00:00 2001 From: zleyyij Date: Mon, 24 Jul 2023 17:24:03 -0600 Subject: [PATCH] docker: fixed dockerfile, k8s incomplete --- .dockerignore | 1 + Dockerfile | 18 ++++++++++-------- Makefile | 4 ++-- k8s/dev/mongo.yaml | 30 +++++++++++++++++++++++++++++- package.json | 1 - 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index 457104b..502b073 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ node_modules docs +src README.md \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 18eeb85..c0e3163 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,19 @@ FROM node:20 # Create a directory for everything to be installed, this is the container working dir for future commands -WORKDIR /usr/src/turing-bot +WORKDIR /usr/src/turingbot -COPY package*.json ./ +COPY package.json ./package.json # Install dependancies - RUN npm install --no-audit --omit=dev +RUN npm install --no-audit --omit=dev -# Copy code over -COPY config.jsonc ./config.jsonc -COPY Makefile ./Makefile -COPY target/ ./target/ +# # Copy code over +# COPY config.jsonc ./ +# COPY Makefile ./ +# COPY target/ ./target/ +# COPY .git/ ./.git/ +COPY . . # Run it without compiling -CMD ["make", "run"] \ No newline at end of file +CMD ["node", "/usr/src/turingbot/target/core/main.js"] \ No newline at end of file diff --git a/Makefile b/Makefile index 50f6637..eda5ecc 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ docker-build: build # Start a pre-existing docker container in daemon mode docker-start: - docker run --rm -d turingbot turingbot + docker run --rm -d turingbot # Make a bot docker container and start it in daemon mode docker-run: docker-build @@ -62,4 +62,4 @@ docker-docs: docs # --rm removes the container once it's finished running, # -d means to run in daemon mode, -p 8080:80 indicates that we want to # take port 80 inside the container and map it to port 8080 on the outside - docker run --rm -d -p 8080:80 --name turingdocs turingdocs \ No newline at end of file + docker run --rm -d -p 8080:80 turingdocs \ No newline at end of file diff --git a/k8s/dev/mongo.yaml b/k8s/dev/mongo.yaml index 89c1437..86da3ad 100644 --- a/k8s/dev/mongo.yaml +++ b/k8s/dev/mongo.yaml @@ -10,6 +10,26 @@ spec: - port: 27017 targetPort: 27017 --- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: slow +provisioner: kubernetes.io/gce-pd +parameters: + type: pd-standard +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: mongo-volume-claim +spec: + storageClassName: "slow" + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 512Mi +--- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -28,8 +48,16 @@ spec: containers: - name: mongodb image: mongo:6.0 + args: ['--dbpath','/data/db'] env: - name: MONGO_INITDB_ROOT_USERNAME value: root - name: MONGO_INITDB_ROOT_PASSWORD - value: root \ No newline at end of file + value: root + volumeMounts: + - name: 'mongo-volume-claim' + mountPath: '/data/db' + volumes: + - name: mongo-volume-claim + persistentVolumeClaim: + claimName: 'mongo-volume-claim' \ No newline at end of file diff --git a/package.json b/package.json index d9d4f60..c9c9c9c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,5 @@ { "version": "0.1.0", - "main": "./core/main.ts", "type": "module", "directories": { "test": "tests"