From ac850934ed20d5a3f33842489b4e6a791cceafe1 Mon Sep 17 00:00:00 2001
From: Jose Raul Barreras <barreras@unl.edu>
Date: Tue, 30 Apr 2019 10:22:13 -0500
Subject: [PATCH] remove containers creation and disable tenable tests
---
Makefile | 31 +++++++------------------------
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
index 507c94e..bf1501b 100644
--- a/Makefile
+++ b/Makefile
@@ -39,79 +39,62 @@ static-code-analysis: static-code-analysis_latest static-code-analysys_php stati
####################
php-lint_5.6: php-lint/5.6/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:5.6 -f php-lint/5.6/Dockerfile php-lint
- docker tag ${REPO_ORG}/php-lint:5.6 unl-its/php-lint:5.6
php-lint_7.0: php-lint/7.0/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.0 -f php-lint/7.0/Dockerfile php-lint
- docker tag ${REPO_ORG}/php-lint:7.0 unl-its/php-lint:7.0
php-lint_7.1: php-lint/7.1/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.1 -f php-lint/7.1/Dockerfile php-lint
- docker tag ${REPO_ORG}/php-lint:7.1 unl-its/php-lint:7.1
php-lint_7.2: php-lint/7.2/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.2 -f php-lint/7.2/Dockerfile php-lint
- docker tag ${REPO_ORG}/php-lint:7.2 unl-its/php-lint:7.2
php-lint_latest: php-lint_7.2
docker tag unl-its/php-lint:7.2 ${REPO_ORG}/php-lint:latest
- docker tag ${REPO_ORG}/php-lint:latest unl-its/php-lint:latest
# PHP Unit Test Images
####################
php-unit-test_5.6: php-unit-test/5.6/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:5.6 -f php-unit-test/5.6/Dockerfile php-unit-test
- docker tag ${REPO_ORG}/php-unit-test:5.6 unl-its/php-unit-test:5.6
php-unit-test_7.0: php-unit-test/7.0/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.0 -f php-unit-test/7.0/Dockerfile php-unit-test
- docker tag ${REPO_ORG}/php-unit-test:7.0 unl-its/php-unit-test:7.0
php-unit-test_7.1: php-unit-test/7.1/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.1 -f php-unit-test/7.1/Dockerfile php-unit-test
- docker tag ${REPO_ORG}/php-unit-test:7.1 unl-its/php-unit-test:7.1
php-unit-test_7.2: php-unit-test/7.2/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.2 -f php-unit-test/7.2/Dockerfile php-unit-test
- docker tag ${REPO_ORG}/php-unit-test:7.2 unl-its/php-unit-test:7.2
php-unit-test_latest: php-unit-test_7.2
docker tag ${REPO_ORG}/php-unit-test:7.2 ${REPO_ORG}/php-unit-test:latest
- docker tag ${REPO_ORG}/php-unit-test:7.2 unl-its/php-unit-test:latest
# Application Images
####################
magento2-unit-test: magento2-unit-test/latest/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/magento2-unit-test:latest magento2-unit-test/latest
- docker tag ${REPO_ORG}/magento2-unit-test:latest unl-its/magento2-unit-test:latest
magento2-xml-lint: magento2-unit-test magento2-xml-lint/latest/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/magento2-xml-lint:latest magento2-xml-lint/latest
- docker tag ${REPO_ORG}/magento2-xml-lint:latest unl-its/magento2-xml-lint:latest
# Mobile Applications
####################
android-build-server: android-build-server/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/android-build-server:latest android-build-server
- docker tag ${REPO_ORG}/android-build-server:latest unl-its/android-build-server:latest
# Sonarqube static-code-analysis
# #####################
static-code-analysis_latest: static-code-analysis/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:latest static-code-analysis/
- docker tag ${REPO_ORG}/static-code-analysis:latest unl-its/static-code-analysis:latest
static-code-analysys_php: static-code-analysis/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:php static-code-analysis/
- docker tag ${REPO_ORG}/static-code-analysis:php unl-its/static-code-analysis:php
static-code-analysys_python: static-code-analysis/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:python static-code-analysis/
- docker tag ${REPO_ORG}/static-code-analysis:python unl-its/static-code-analysis:python
static-code-analysys_android: android-build-server static-code-analysis/android/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/static-code-analysis:android static-code-analysis/android/
- docker tag ${REPO_ORG}/static-code-analysis:android unl-its/static-code-analysis:android
# Cleanup
####################
@@ -129,12 +112,12 @@ $(IMAGES_TO_CLEAN):
@docker rmi $(shell docker images --format '{{.Repository}}:{{.Tag}}' --filter reference=$@)
IMAGES_TO_SCAN = $(shell docker images --format '{{.Repository}}:{{.Tag}}' | grep unl-its )
-security:
- @docker login -u ${TENABLE_IO_ACCESS_KEY} -p ${TENABLE_IO_SECRET_KEY} registry.cloud.tenable.com
- @for image in $(IMAGES_TO_SCAN); do \
- docker tag $$image registry.cloud.tenable.com/`echo $$image | cut -d "/" -f 2`; \
- docker push registry.cloud.tenable.com/`echo $$image | cut -d "/" -f 2`; \
- done
+#security:
+# @docker login -u ${TENABLE_IO_ACCESS_KEY} -p ${TENABLE_IO_SECRET_KEY} registry.cloud.tenable.com
+# @for image in $(IMAGES_TO_SCAN); do \
+# docker tag $$image registry.cloud.tenable.com/`echo $$image | cut -d "/" -f 2`; \
+# docker push registry.cloud.tenable.com/`echo $$image | cut -d "/" -f 2`; \
+# done
IMAGES_TO_PUBLISH = $(shell docker images --format '{{.Repository}}:{{.Tag}}' --filter 'dangling=false' | grep $(REPO_ORG) | grep -v ':<none>$$' )
publish:
@@ -151,7 +134,7 @@ help:
@echo -e "make <TARGET> \n\t # Creates an specific image"
@echo -e "make clean \n\t # Cleanup"
@echo -e "make publish \n\t # Push the images to the UNL registry"
- @echo -e "make security \n\t # Send the images to Tenable. Use env variables TENABLE_IO_ACCESS_KEY and TENABLE_IO_SECRET_KEY"
+# @echo -e "make security \n\t # Send the images to Tenable. Use env variables TENABLE_IO_ACCESS_KEY and TENABLE_IO_SECRET_KEY"
debug:
@echo -e "DOCKERFILES: \t $(DOCKERFILES)"
--
GitLab