Skip to content
Snippets Groups Projects
Commit 611538af authored by Matt Tesauro's avatar Matt Tesauro
Browse files

Made a few minor changes to sync things up

parent d5044722
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ docker rmi $(docker images | grep "none" | awk '/ / { print $3 }') ...@@ -4,8 +4,8 @@ docker rmi $(docker images | grep "none" | awk '/ / { print $3 }')
#docker rmi $(docker images -q) #docker rmi $(docker images -q)
echo "Building dockers" echo "Building dockers"
#--no-cache #--no-cache
docker build -f dockers/base/dockerfile-base . -t appsecpipeline/base:1.3 docker build -f dockers/base/dockerfile-base . -t appsecpipeline/base:1.4
docker build -f dockers/base/dockerfile-base-tools . -t appsecpipeline/base-tools:1.8 docker build -f dockers/base/dockerfile-base-tools . -t appsecpipeline/base-tools:1.7
docker build -f dockers/base/dockerfile-sast . -t appsecpipeline/sast:1.0 docker build -f dockers/base/dockerfile-sast . -t appsecpipeline/sast:1.0
docker build -f dockers/base/dockerfile-node . -t appsecpipeline/node:1.1 docker build -f dockers/base/dockerfile-node . -t appsecpipeline/node:1.1
docker build -f dockers/base/dockerfile-ruby . -t appsecpipeline/ruby:1.0 docker build -f dockers/base/dockerfile-ruby . -t appsecpipeline/ruby:1.0
......
...@@ -399,7 +399,7 @@ git: ...@@ -399,7 +399,7 @@ git:
- "Utility" - "Utility"
type: "utility" type: "utility"
description: "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." description: "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
docker: "appsecpipeline/base:1.3" docker: "appsecpipeline/base:1.4"
url: https://git-scm.com/ url: https://git-scm.com/
documentation: https://git-scm.com/docs/git documentation: https://git-scm.com/docs/git
parameters: parameters:
......
FROM ubuntu:16.04 FROM ubuntu:16.04
# ASPTAG = appsecpipeline/base:1.2 # ASPTAG = appsecpipeline/base:1.4
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
...@@ -24,6 +24,9 @@ ENV PATH="/usr/bin/appsecpipeline/tools:${PATH}" ...@@ -24,6 +24,9 @@ ENV PATH="/usr/bin/appsecpipeline/tools:${PATH}"
RUN sh /tmp/setupdocker.sh RUN sh /tmp/setupdocker.sh
RUN rm /tmp/setupdocker.sh RUN rm /tmp/setupdocker.sh
########## Change to appsecpipeline user ##########
USER appsecpipeline
ENTRYPOINT ["launch.py"] ENTRYPOINT ["launch.py"]
HEALTHCHECK --interval=1m --retries=2 --timeout=5s CMD python /usr/bin/appsecpipeline/tools/health.py HEALTHCHECK --interval=1m --retries=2 --timeout=5s CMD python /usr/bin/appsecpipeline/tools/health.py
...@@ -4,7 +4,7 @@ git: ...@@ -4,7 +4,7 @@ git:
- "Utility" - "Utility"
type: "utility" type: "utility"
description: "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency." description: "Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
docker: "appsecpipeline/base:1.3" docker: "appsecpipeline/base:1.4"
url: https://git-scm.com/ url: https://git-scm.com/
documentation: https://git-scm.com/docs/git documentation: https://git-scm.com/docs/git
parameters: parameters:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment