UNCLASSIFIED

Commit aa1ac013 authored by Vickie Shen's avatar Vickie Shen
Browse files

Merge branch 'fix-contrib' into 'development'

testing

See merge request !43
parents d3c1a965 05404567
Pipeline #330846 passed with stages
in 14 minutes and 28 seconds
...@@ -12,29 +12,27 @@ COPY --from=base /opt/app /opt/app ...@@ -12,29 +12,27 @@ COPY --from=base /opt/app /opt/app
COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules COPY --from=base /usr/local/lib/node_modules /usr/local/lib/node_modules
COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
COPY scripts/server.js /opt/app/server/server.js COPY scripts/server.js /opt/app/server/server.js
# COPY statsd-client-0.4.7.tgz /opt/app
WORKDIR /opt/app WORKDIR /opt/app
RUN dnf upgrade -y && \ RUN dnf upgrade -y && \
dnf install npm -y && \ dnf install npm -y && \
# npm install statsd-client-0.4.7.tgz && \
# rm statsd-client-0.4.7.tgz && \
npm install --production && \ npm install --production && \
dnf -y remove npm && \ dnf -y remove npm && \
dnf clean all && \ dnf clean all && \
rm -rf /var/cache/dnf && \ rm -rf /var/cache/dnf && \
chown -R node:node /opt/app && \ chown -R node:node /opt/app && \
chmod -R g-s /usr/local/lib/ && \
chmod 775 /usr/local/bin/docker-entrypoint.sh chmod 775 /usr/local/bin/docker-entrypoint.sh
USER node:node USER node:node
ENV PORT=80 ENV PORT=8080
EXPOSE 80 EXPOSE 8080
VOLUME /opt/app/server-data VOLUME /opt/app/server-data
HEALTHCHECK --start-period=5s --timeout=5s CMD curl -fs http://127.0.0.1:80/ || exit 1 HEALTHCHECK --start-period=5s --timeout=5s CMD curl -fs http://127.0.0.1:8080/ || exit 1
ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["docker-entrypoint.sh"]
......
...@@ -17,6 +17,6 @@ ...@@ -17,6 +17,6 @@
], ],
"depNameTemplate": "lovasoa/wbo", "depNameTemplate": "lovasoa/wbo",
"datasourceTemplate": "docker" "datasourceTemplate": "docker"
}, }
] ]
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment