Skip to content

Commit

Permalink
test update
Browse files Browse the repository at this point in the history
  • Loading branch information
aarongundel committed Dec 26, 2023
1 parent a2dc448 commit 4665077
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions arches_rdm_example_project/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const { buildVueFilePathLookup } = require('./webpack-utils/build-vue-filepath-l
module.exports = () => {
return new Promise((resolve, _reject) => {
const createWebpackConfig = function(data) { // reads from application's settings.py
console.log('rawData', data);
const parsedData = JSON.parse(data);
console.log('Data imported from settings.py:', parsedData)

Expand Down
4 changes: 2 additions & 2 deletions docker/production/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get install wget -y && wget -qO - https://artifacts.elastic.co/GPG-KEY-
&& echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/8.x/apt stable main" | tee /etc/apt/sources.list.d/elastic-8.x.list \
&& apt-get update
RUN apt-get install sudo && echo 'Y' | adduser elasticsearch --disabled-password --ingroup "sudo" --gecos "First Last,RoomNumber,WorkPhone,HomePhone" && echo "elasticsearch ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && su -c "sudo apt-get install elasticsearch" elasticsearch && exit
RUN apt-get install postgresql-contrib-14 -y && sed -i '1s/^/local all all trust\n/' /etc/postgresql/14/main/pg_hba.conf && (service postgresql start) \
RUN apt-get install postgresql-contrib-14 postgresql-14-postgis-3 -y && sed -i '1s/^/local all all trust\n/' /etc/postgresql/14/main/pg_hba.conf && (service postgresql start) \
&& echo "ALTER USER postgres WITH PASSWORD 'postgis';CREATE DATABASE template_postgis;CREATE EXTENSION postgis;\\q" | psql -Upostgres

COPY arches_rdm_example_project/arches_rdm_example_project ${WEB_ROOT}/arches_rdm_example_project/arches_rdm_example_project
Expand All @@ -30,7 +30,7 @@ RUN chown elasticsearch:elasticsearch /etc/elasticsearch -R && \
chown elasticsearch:elasticsearch /usr/share/elasticsearch -R && \
chown elasticsearch:elasticsearch /etc/default/elasticsearch && \
cd arches_rdm_example_project && yarn install
RUN apt-get install postgresql-14-postgis-3 -y

RUN ESPASSWORD='$(echo "y" | sudo /usr/share/elasticsearch/bin/elasticsearch-reset-password -u elastic | grep "New value:" | cut -d " " -f 3)' && export ES_JAVA_OPTS="-Xmx1g" && \
sed -i 's/xpack.security.enabled: true/xpack.security.enabled: false/g' /etc/elasticsearch/elasticsearch.yml && \
sed -i 's/xpack.security.enrollment.enabled: true/xpack.security.enrollment.enabled: false/g' /etc/elasticsearch/elasticsearch.yml && \
Expand Down

0 comments on commit 4665077

Please sign in to comment.