From 3a846b03e4ef7ebdcc8d7cb1a1b1e14e5f5e31ab Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sun, 4 Nov 2018 12:55:21 -0500 Subject: [PATCH] fix: dockerfile env vars --- client/components/admin/admin-users-edit.vue | 158 +++++++++++++++++++ config.sample.yml | 2 +- dev/build/Dockerfile | 2 +- dev/build/config.yml | 16 ++ dev/docker/config.yml | 4 +- 5 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 client/components/admin/admin-users-edit.vue create mode 100644 dev/build/config.yml diff --git a/client/components/admin/admin-users-edit.vue b/client/components/admin/admin-users-edit.vue new file mode 100644 index 00000000..bef7c233 --- /dev/null +++ b/client/components/admin/admin-users-edit.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/config.sample.yml b/config.sample.yml index bb2944f7..4cda0685 100644 --- a/config.sample.yml +++ b/config.sample.yml @@ -8,7 +8,7 @@ # Port the server should listen to # --------------------------------------------------------------------- -port: 80 +port: 3000 # --------------------------------------------------------------------- # IP address the server should listen to diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile index 51109bdc..21a242f5 100644 --- a/dev/build/Dockerfile +++ b/dev/build/Dockerfile @@ -40,7 +40,7 @@ COPY --from=assets /var/wiki/assets ./assets COPY --from=assets /var/wiki/node_modules ./node_modules COPY --from=assets /var/wiki/server ./server COPY ./server ./server -COPY ./config.sample.yml ./config.yml +COPY ./dev/build/config.yml ./config.yml COPY ./package.json ./package.json COPY ./LICENSE ./LICENSE diff --git a/dev/build/config.yml b/dev/build/config.yml new file mode 100644 index 00000000..b5c030df --- /dev/null +++ b/dev/build/config.yml @@ -0,0 +1,16 @@ +port: $(PORT) +bindIP: 0.0.0.0 +db: + type: $(DB_TYPE) + host: $(DB_HOST) + port: $(DB_PORT) + user: $(DB_USER) + pass: $(DB_PASS) + db: $(DB_NAME) + storage: $(DB_FILEPATH) +redis: + host: $(REDIS_HOST) + port: $(REDIS_PORT) + db: $(REDIS_DB) + password: $(REDIS_PASS) +logLevel: info diff --git a/dev/docker/config.yml b/dev/docker/config.yml index a35c3b4f..7003e329 100644 --- a/dev/docker/config.yml +++ b/dev/docker/config.yml @@ -1,7 +1,5 @@ port: 3000 -paths: - content: ./content - data: ./data +bindIP: 0.0.0.0 db: type: postgres host: db