commit e4769dbb58dbc6eac5c17b1ff6992c40ddf547c9
parent c6cc1dc3515e5e20c5d2131de0ef1ded411a7588
Author: srfsh <dev@srf.sh>
Date: Tue, 19 Jul 2022 15:02:51 +0300
devop: move zvmlet dockerfile to zencode
Diffstat:
4 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -91,6 +91,7 @@
/zencode/*
!/zencode/*/
!/zencode/README.md
+!/zencode/Dockerfile
!/zencode/src/*.zen
!/zencode/test/*.sh
@@ -105,7 +106,6 @@
/devop/*
!/devop/Dockerfile
!/devop/.docker-compose.templ
-!/devop/zvmlet-dockerfile
# github stuff
!/.github/
diff --git a/devop/.docker-compose.templ b/devop/.docker-compose.templ
@@ -57,8 +57,8 @@ services:
image: zvmlet:latest
build:
context: ../
- dockerfile: devop/zvmlet-dockerfile
+ dockerfile: zencode/Dockerfile
environment:
HTTP_PORT: *room_port
volumes:
- - ../zencode:/restroom-mw/contracts:ro
+ - ../zencode/src:/app/contracts:ro
diff --git a/devop/zvmlet-dockerfile b/devop/zvmlet-dockerfile
@@ -1,38 +0,0 @@
-# Zenflows is designed to implement the Valueflows vocabulary,
-# written and maintained by srfsh <info@dyne.org>.
-# Copyright (C) 2021-2022 Dyne.org foundation <foundation@dyne.org>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-ARG NODE_VERSION=16
-# Importing node12 docker image
-FROM node:$NODE_VERSION-alpine
-
-# Add dependencies
-RUN apk add git python3 make g++
-
-# Installing restroom
-RUN yarn create restroom --all restroom-mw
-WORKDIR /restroom-mw
-
-# Configure restroom
-ENV HTTP_PORT=3000
-ENV HTTPS_PORT=3301
-ENV OPENAPI=true
-ENV FILES_DIR=./contracts
-ENV CHAIN_EXT=chain
-ENV YML_EXT=yml
-
-# yarn install and run
-CMD yarn start
diff --git a/zencode/Dockerfile b/zencode/Dockerfile
@@ -0,0 +1,39 @@
+# Zenflows is designed to implement the Valueflows vocabulary,
+# written and maintained by srfsh <info@dyne.org>.
+# Copyright (C) 2021-2022 Dyne.org foundation <foundation@dyne.org>.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+ARG NODE_VERSION=16
+# Importing node12 docker image
+FROM node:$NODE_VERSION-alpine
+
+WORKDIR /app
+
+# Add dependencies
+RUN apk add git python3 make g++
+
+# Installing restroom
+RUN yarn create restroom -a .
+
+# Configure restroom
+ENV HTTP_PORT=3000
+ENV HTTPS_PORT=3301
+ENV OPENAPI=true
+ENV FILES_DIR=./contracts
+ENV CHAIN_EXT=chain
+ENV YML_EXT=yml
+
+# yarn install and run
+CMD yarn start
