Skip to content

Commit 50524bc

Browse files
author
Vicente Herrera
committed
Refactored Makefile to include all target for both images
1 parent 0ff3305 commit 50524bc

File tree

1 file changed

+78
-43
lines changed

1 file changed

+78
-43
lines changed

‎Makefile‎

Lines changed: 78 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,53 @@
11

2-
VERSION_FULL=1.0.0
2+
VERSION_FULL=1.2.1
33
VERSION_MAJOR=$(shell echo "${VERSION_FULL}" | sed 's/[^0-9]*\([0-9]\+\).*/\1/' )
44

5-
INSTALLER_IMAGE=sysdiglabs/aks-audit-log-installer
5+
INSTALLER_IMAGE=aks-audit-log-installer
6+
INSTALLER_DIR=./
7+
INSTALLER_DESC=${FORWARDER_DIR}/README.md
8+
INSTALLER_DOCKERFILE=${INSTALLER_DIR}/build/Dockerfile
69

7-
FORWARDER_IMAGE=sysdiglabs/aks-audit-log-installer
10+
FORWARDER_IMAGE=aks-audit-log-forwarder
811
FORWARDER_DIR=./AKSKubeAuditReceiverSolution
12+
FORWARDER_DESC=${FORWARDER_DIR}/AKSKubeAuditReceiver/README.md
913
FORWARDER_DOCKERFILE=${FORWARDER_DIR}/AKSKubeAuditReceiver/Dockerfile
1014

15+
DOCKERHUB_USERNAME=$(shell cat ${KEYS}/DOCKER_USER)
16+
DOCKERHUB_PASSWORD=$(shell cat ${KEYS}/DOCKER_PASS)
17+
DOCKERHUB_ORG=sysdiglabs
18+
19+
GITHUB_USER=$(shell cat ${KEYS}/GH_USER)
20+
GITHUB_PAT_PATH="${KEYS}/GH_PAT_PKG"
21+
GITHUB_REPO=sysdiglabs/aks-audit-log
22+
1123
RESOURCE_GROUP="aks-test-group"
1224
CLUSTER_NAME="aks-test-cluster"
1325

1426
SYSDIG_SECURE_API_TOKEN=$(shell cat ${KEYS}/SYSDIG_SECURE_API_TOKEN)
15-
DOCKERHUB_USERNAME=$(shell cat ${KEYS}/DOCKER_USER)
16-
DOCKERHUB_PASSWORD=$(shell cat ${KEYS}/DOCKER_PASS)
17-
DOCKERHUB_ORG=sysdiglabs
1827

1928
# -----------------------------------------------------------------------------
2029

21-
installer-build-image:
22-
docker build . -f build/Dockerfile -t ${INSTALLER_IMAGE}:dev \
23-
-t docker push ${INSTALLER_IMAGE}:latest \
24-
-t docker push ${INSTALLER_IMAGE}:${VERSION_FULL} \
25-
-t docker push ${INSTALLER_IMAGE}:${VERSION_MAJOR}
30+
installer-build-image: IMAGE_DIR=${INSTALLER_DIR}
31+
installer-build-image: IMAGE_DOCKERFILE=${INSTALLER_DOCKERFILE}
32+
installer-build-image: IMAGE=${DOCKERHUB_ORG}/${INSTALLER_IMAGE}
33+
installer-build-image: build-image
2634

27-
installer-push-dev:
28-
docker push ${INSTALLER_IMAGE}:dev
35+
installer-build-push-dev:
36+
docker build ${INSTALLER_DIR} -f ${INSTALLER_DOCKERFILE} -t ${DOCKERHUB_ORG}/${INSTALLER_IMAGE}:dev
37+
docker push ${DOCKERHUB_ORG}/${INSTALLER_IMAGE}:dev
2938

30-
installer-scan: IMAGE=${INSTALLER_IMAGE}
39+
installer-scan: IMAGE=${DOCKERHUB_ORG}/${INSTALLER_IMAGE}
3140
installer-scan: inline-scan
3241

33-
installer-push: check-shell installer-build-image installer-scan
34-
docker push ${INSTALLER_IMAGE}:latest
35-
docker push ${INSTALLER_IMAGE}:${VERSION_FULL}
36-
docker push ${INSTALLER_IMAGE}:${VERSION_MAJOR}
42+
installer-dockerhub-readme: IMAGE=${DOCKERHUB_ORG}/${INSTALLER_IMAGE}
43+
installer-dockerhub-readme: DESC_PATH=${INSTALLER_DESC}
44+
installer-dockerhub-readme: update-dockerhub-readme
3745

38-
installer-dockerhub-readme:
39-
echo 'Updating Dockerhub description' ; \
40-
echo 'Readme: ${PWD}/build/README.md' ; \
41-
echo 'Repository: ${INSTALLER_IMAGE}' ; \
42-
docker run -v ${PWD}/build:/workspace \
43-
-e DOCKERHUB_USERNAME='${DOCKERHUB_USERNAME}' \
44-
-e DOCKERHUB_PASSWORD='${DOCKERHUB_PASSWORD}' \
45-
-e DOCKERHUB_REPOSITORY='${INSTALLER_IMAGE}' \
46-
-e README_FILEPATH='/workspace/README.md' \
47-
peterevans/dockerhub-description:2
46+
installer-push: IMAGE=${DOCKERHUB_ORG}/${INSTALLER_IMAGE}
47+
installer-push: check-shell installer-build-image installer-scan push
48+
49+
installer-gh-pkg-release: IMAGE_NAME=${INSTALLER_IMAGE}
50+
installer-gh-pkg-release: check-shell installer-build-image installer-scan gh-pkg-release
4851

4952
# -----------------------------------------------------------------------------
5053

@@ -53,35 +56,39 @@ forwarder-build:
5356

5457
forwarder-test: check-yaml check-dotnet
5558

56-
forwarder-build-image:
57-
docker build ${FORWARDER_DIR} -f ${FORWARDER_DOCKERFILE} \
58-
-t ${FORWARDER_IMAGE}:latest \
59-
-t ${FORWARDER_IMAGE}:dev \
60-
-t ${FORWARDER_IMAGE}:${VERSION_FULL} \
61-
-t ${FORWARDER_IMAGE}:${VERSION_MAJOR}
59+
forwarder-build-image: IMAGE_DIR=${FORWARDER_DIR}
60+
forwarder-build-image: IMAGE_DOCKERFILE=${FORWARDER_DOCKERFILE}
61+
forwarder-build-image: IMAGE=${DOCKERHUB_ORG}/${FORWARDER_IMAGE}
62+
forwarder-build-image: build-image
6263

63-
forwarder-push-dev:
64-
docker push ${FORWARDER_IMAGE}:dev
64+
forwarder-build-push-dev:
65+
docker build ${FORWARDER_DIR} -f ${FORWARDER_DOCKERFILE} -t ${DOCKERHUB_ORG}/${FORWARDER_IMAGE}:dev
66+
docker push ${DOCKERHUB_ORG}/${FORWARDER_IMAGE}:dev
6567

6668
forwarder-scan: IMAGE=${FORWARDER_IMAGE}
6769
forwarder-scan: inline-scan
6870

69-
forwarder-push: forwarder-test forwarder-build-image forwarder-scan
70-
docker push ${FORWARDER_IMAGE}:latest
71-
docker push ${FORWARDER_IMAGE}:${VERSION_FULL}
72-
docker push ${FORWARDER_IMAGE}:${VERSION_MAJOR}
71+
forwarder-dockerhub-readme: IMAGE=${DOCKERHUB_ORG}/${FORWARDER_IMAGE}
72+
forwarder-dockerhub-readme: DESC_PATH=${FORWARDER_DESC}
73+
forwarder-dockerhub-readme: update-dockerhub-readme
74+
75+
forwarder-push: IMAGE=${DOCKERHUB_ORG}/${FORWARDER_IMAGE}
76+
forwarder-push: forwarder-test forwarder-build forwarder-build-image forwarder-scan push
77+
78+
forwarder-gh-pkg-release: IMAGE_NAME=${FORWARDER_IMAGE}
79+
forwarder-gh-pkg-release: fowarder-test forwarder-build forwarder-build-image forwarder-scan gh-pkg-release
7380

7481
# -----------------------------------------------------------------------------
7582

7683
install:
7784
docker run -it -v ${HOME}/.azure:/root/.azure \
78-
sysdiglabs/aks-audit-log-installer:${MINOR} \
85+
${DOCKERHUB_ORG}/${INSTALLER_IMAGE}:${MINOR} \
7986
-g ${RESOURCE_GROUP} -c ${CLUSTER_NAME}
8087

8188
uninstall:
8289
docker run -it -v ${HOME}/.azure:/root/.azure \
8390
--entrypoint /app/uninstall-aks-audit-log.sh \
84-
sysdiglabs/aks-audit-log-installer:${MINOR} \
91+
${DOCKERHUB_ORG}/${INSTALLER_IMAGE}:${MINOR} \
8592
-g ${RESOURCE_GROUP} -c ${CLUSTER_NAME}
8693

8794

@@ -107,10 +114,38 @@ check-dotnet:
107114

108115
# -----------------------------------------------------------------------------
109116

117+
build-image:
118+
docker build ${IMAGE_DIR} -f ${IMAGE_DOCKERFILE} \
119+
-t ${DOCKERHUB_ORG}/${IMAGE}:latest \
120+
-t ${DOCKERHUB_ORG}/${IMAGE}:dev \
121+
-t ${DOCKERHUB_ORG}/${IMAGE}:${VERSION_FULL} \
122+
-t ${DOCKERHUB_ORG}/${IMAGE}:${VERSION_MAJOR}
123+
124+
push:
125+
docker push ${DOCKERHUB_ORG}/${IMAGE}:latest
126+
docker push ${DOCKERHUB_ORG}/${IMAGE}:${VERSION_FULL}
127+
docker push ${DOCKERHUB_ORG}/${IMAGE}:${VERSION_MAJOR}
128+
129+
update-dockerhub-readme:
130+
echo 'Updating Dockerhub description' ; \
131+
echo 'Readme: ${DESC_PATH}' ; \
132+
echo 'Repository: ${IMAGE}' ; \
133+
docker run -v ${DESC_PATH}:/workspace/README.md \
134+
-e DOCKERHUB_USERNAME='${DOCKERHUB_USERNAME}' \
135+
-e DOCKERHUB_PASSWORD='${DOCKERHUB_PASSWORD}' \
136+
-e DOCKERHUB_REPOSITORY='${IMAGE}' \
137+
-e README_FILEPATH='/workspace/README.md' \
138+
peterevans/dockerhub-description:2
139+
140+
gh-pkg-release:
141+
cat ${GITHUB_PAT_PATH} | docker login https://docker.pkg.github.com -u ${GITHUB_USER} --password-stdin
142+
docker build . -f build/Dockerfile -t docker.pkg.github.com/${GITHUB_REPO}/${IMAGE_NAME}:${VERSION_FULL}
143+
docker push docker.pkg.github.com/${GITHUB_REPO}/${IMAGE_NAME}:${VERSION_FULL}
144+
110145
inline-scan:
111146
@curl -s https://download.sysdig.com/stable/inline_scan.sh | \
112147
bash -s -- \
113-
analyze -s https://secure.sysdig.com -o -k ${SYSDIG_SECURE_API_TOKEN} ${INSTALLER_IMAGE} ; \
148+
analyze -s https://secure.sysdig.com -o -k ${SYSDIG_SECURE_API_TOKEN} ${IMAGE} ; \
114149
RESULT=$$? ; \
115150
echo ; echo "******************************" ; \
116151
[ "$$RESULT" -eq 0 ] && echo "** Scan result > PASS < **" ; \

0 commit comments

Comments
 (0)