Skip to content
Snippets Groups Projects
Commit 1b941bd0 authored by George Sedov's avatar George Sedov
Browse files

fix /var/run issue

parent 6b07ef8d
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*
COPY scripts/ /var/run/asapo/
COPY scripts/ /var/asapo/
COPY jobs-* /usr/bin/
COPY asapo-wait-service /usr/bin/
COPY supervisord.conf /etc/
......@@ -34,29 +34,9 @@ COPY *.hcl.tpl /etc/asapo/
RUN mkdir -p /var/log/supervisord/ /etc/consul.d /etc/nomad.d /var/nomad /var/consul
RUN ls -la /var
RUN cd /var/asapo && terraform init
RUN ls -la /run
RUN ls -la /var/run
RUN ls -la /var/run/asapo
RUN mount
RUN cd /var/run/asapo && terraform init
RUN ls -la /var
RUN ls -la /run
RUN ls -la /var/run
RUN ls -la /var/run/asapo
RUN mount
RUN chmod -R og+wrX /var/log /var/lib /var/tmp /var/run/asapo /var/nomad /var/consul /etc/consul.d /etc/nomad.d
RUN chmod -R og+wrX /var/log /var/lib /var/tmp /var/asapo /var/nomad /var/consul /etc/consul.d /etc/nomad.d
ENTRYPOINT ["supervisord", "--configuration", "/etc/supervisord.conf"]
......@@ -7,11 +7,11 @@ if [ ! -f /var/nomad/token ] && [ "${ACL_ENABLED}" = "true" ]; then
cat /var/nomad/token
fi
if [ -f /var/run/asapo/user_vars.tfvars ]; then
USER_VAR_FILE="-var-file=/var/run/asapo/user_vars.tfvars"
if [ -f /var/asapo/user_vars.tfvars ]; then
USER_VAR_FILE="-var-file=/var/asapo/user_vars.tfvars"
fi
cd /var/run/asapo && terraform apply -auto-approve $USER_VAR_FILE "$@"
cd /var/asapo && terraform apply -auto-approve $USER_VAR_FILE "$@"
if [ "${ACL_ENABLED}" = "true" ]; then
cat /var/nomad/token
......
......@@ -2,8 +2,8 @@
#export NOMAD_TOKEN=`cat /var/nomad/token `
if [ -f /var/run/asapo/user_vars.tfvars ]; then
USER_VAR_FILE="-var-file=/var/run/asapo/user_vars.tfvars"
if [ -f /var/asapo/user_vars.tfvars ]; then
USER_VAR_FILE="-var-file=/var/asapo/user_vars.tfvars"
fi
cd /var/run/asapo && terraform destroy -auto-approve $USER_VAR_FILE "$@"
cd /var/asapo && terraform destroy -auto-approve $USER_VAR_FILE "$@"
......@@ -20,7 +20,7 @@ alertmanager_version = "v0.23.0"
asapo_alert_email = ""
asapo_alert_email_smart_host = ""
job_scripts_dir = "/var/run/asapo"
job_scripts_dir = "/var/asapo"
receiver_total_memory_size = 2000
receiver_dataserver_cache_size = 1 #gb
......@@ -62,4 +62,4 @@ alertmanager_port = 9093
n_receivers = 1
n_brokers = 1
n_fts = 1
\ No newline at end of file
n_fts = 1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment