e2e test fix

ltonetwork · Apr 23, 2023 · f001abd · f001abd
1 parent 8755f40
commit f001abd
Show file tree

Hide file tree

Showing 12 changed files with 419 additions and 712 deletions.
diff --git a/.Dockerignore b/.Dockerignore
@@ -1,6 +1,5 @@
 dist/
 node_modules/
-frontend/node_modules/
 test/
 Dockerfile
 README.md
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - 16
+  - 18
 
 sudo: false
 
@@ -11,4 +11,3 @@ branches:
 
 script:
   npm run test:all
-
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN npm i
 # Bundle app source
 COPY . .
 
-RUN echo $(git describe --tags) > ./version.txt
+RUN npm version $(git describe --tags) --no-git-tag-version
 
 RUN npm run build
 
@@ -23,11 +23,8 @@ FROM node:18-alpine
 # Move the build files from build folder to app folder
 WORKDIR /usr/app
 COPY --from=build /usr/src/dist ./
-COPY --from=build /usr/src/version.txt ./
 COPY --from=build /usr/src/node_modules ./node_modules/
 
-ADD package.json ./
-
 RUN npm install -g pm2
 
 EXPOSE 80

diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/github_deploy_key.enc b/github_deploy_key.enc