Skip to content

Commit

Permalink
Fixes to Dockerfile. 1.5.15 release ongoing.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lomilar committed Sep 22, 2022
1 parent d372af5 commit 59ed599
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16
FROM node:18
WORKDIR /app
COPY package*.json ./
COPY pm2.test.config.js ./pm2.config.js
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,7 @@ Due to the performance improvements in the 1.5 version of CaSS, we highly recomm
* Update src/main/webapp to point at the appropriate gh-pages commit.
* Update CHANGELOG.md
* Update README.md
* Run `npm run buildrun:standaloneTest` to ensure the container can build.
* In another command window, `npm run test:mocha` - Must not fail any tests.
* Commit with release notes.
* Tag commit with version number.
10 changes: 9 additions & 1 deletion docker/standalone/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:8.4.2

USER root
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -qqy nodejs git

Expand All @@ -24,4 +25,11 @@ ENV xpack.security.http.ssl.enabled=false
ENV xpack.security.transport.ssl.enabled=false
EXPOSE 80
VOLUME ["/usr/share/elasticsearch/data","/usr/share/elasticsearch/CASS/etc","/usr/share/elasticsearch/CASS/logs"]
ENTRYPOINT /usr/local/bin/docker-entrypoint.sh & (cd CASS && npm run run:standalone && npm run logs)

RUN mkdir /logs
RUN mkdir CASS/etc
RUN mkdir CASS/logs
RUN chown -R elasticsearch:root CASS /logs

USER elasticsearch:root
ENTRYPOINT (cd CASS && npm run run:standalone && npm run logs) & /bin/tini -- /usr/local/bin/docker-entrypoint.sh
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"buildRun:ubuntu20": "npm run buildRun:kill && docker build --progress plain -f docker/test/ubuntu-20.04-latest/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:ubuntu18:13to15": "npm run buildRun:kill && docker build --progress plain -f docker/test/ubuntu-18.04-latest/Dockerfile-13to15 -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:standaloneWindowsFips": "npm run buildRun:kill && docker build --progress plain -f docker/fips/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:standaloneWindows": "npm run buildRun:kill && docker build --progress plain -f docker/standalone/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:standaloneTest": "npm run buildRun:kill && docker build --progress plain -f docker/standalone/Dockerfile -t cass-test . && docker run -p80:80 -p9200:9200 --name cass-test cass-test",
"buildRun:standalone": "npm run buildRun:kill && docker build --progress plain -f docker/standalone/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:test": "npm run buildRun:kill && docker build --progress plain -f docker/test/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
"buildRun:testReplication": "npm run buildRun:kill && docker build --progress plain -f docker/test/replication/Dockerfile -t cass-test . && docker run -p80:80 --name cass-test cass-test",
Expand Down

0 comments on commit 59ed599

Please sign in to comment.