Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit 98b9585

Browse files
committed
Build a ci-local tagged version of the hook sdk which is then used by the hook builds
Closes #11
1 parent 84f5b98 commit 98b9585

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ jobs:
198198
repository: scbexperimental/hook-sdk-nodejs
199199
path: ./hook-sdk/nodejs/
200200
tag_with_ref: true
201+
tags: "ci-local"
201202
# Actual PersistenceProviders
202203
- uses: docker/build-push-action@v1
203204
name: "Build & Push Elastic PersistenceProvider Hook Image"
@@ -207,6 +208,7 @@ jobs:
207208
repository: scbexperimental/persistence-elastic
208209
path: ./hooks/persistence-elastic/
209210
tag_with_ref: true
211+
build_args: baseImageTag=ci-local
210212
- uses: docker/build-push-action@v1
211213
name: "Build & Push Elastic PersistenceProvider Dashboard Importer Image"
212214
with:
@@ -223,6 +225,7 @@ jobs:
223225
repository: scbexperimental/generic-webhook
224226
path: ./hooks/generic-webhook/
225227
tag_with_ref: true
228+
build_args: baseImageTag=ci-local
226229
- uses: docker/build-push-action@v1
227230
name: "Build & Push ImperativeSubsequentScans Hook Image"
228231
with:
@@ -231,6 +234,7 @@ jobs:
231234
repository: scbexperimental/hook-imperative-subsequent-scans
232235
path: ./hooks/imperative-subsequent-scans/
233236
tag_with_ref: true
237+
build_args: baseImageTag=ci-local
234238
- uses: docker/build-push-action@v1
235239
name: "Build & Push UpdateField Hook Image"
236240
with:
@@ -240,6 +244,7 @@ jobs:
240244
path: ./hooks/update-field/
241245
tag_with_ref: true
242246
tag_with_sha: true
247+
build_args: baseImageTag=ci-local
243248
scannerImages:
244249
# Note we only build images for scanner that don't provider official public container images
245250
name: "Build / Scanner"

hooks/generic-webhook/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
ARG baseImageTag
12
FROM node:12-alpine as build
23
RUN mkdir -p /home/app
34
WORKDIR /home/app
45
COPY package.json package-lock.json ./
56
RUN npm ci --production
67

7-
FROM scbexperimental/hook-sdk-nodejs:latest
8+
FROM scbexperimental/hook-sdk-nodejs:${baseImageTag:-latest}
89
WORKDIR /home/app/hook-wrapper/hook/
910
COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/
1011
COPY --chown=app:app ./hook.js ./hook.js
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# This image doesn't install the hooks dependencies, as it only has the @kubernetes/client-node dependencies which is already installed via the hook-sdk
22

3-
FROM scbexperimental/hook-sdk-nodejs:latest
3+
ARG baseImageTag
4+
FROM scbexperimental/hook-sdk-nodejs:${baseImageTag:-latest}
45
WORKDIR /home/app/hook-wrapper/hook/
56
COPY --chown=app:app hook.js scan-helpers.js ./
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
ARG baseImageTag
12
FROM node:12-alpine as build
23
RUN mkdir -p /home/app
34
WORKDIR /home/app
45
COPY package.json package-lock.json ./
56
RUN npm ci --production
67

7-
FROM scbexperimental/hook-sdk-nodejs:latest
8+
FROM scbexperimental/hook-sdk-nodejs:${baseImageTag:-latest}
89
WORKDIR /home/app/hook-wrapper/hook/
910
COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/
1011
COPY --chown=app:app ./hook.js ./hook.js

hooks/update-field/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
ARG baseImageTag
12
FROM node:12-alpine as build
23
RUN mkdir -p /home/app
34
WORKDIR /home/app
45
COPY package.json package-lock.json ./
56
RUN npm ci --production
67

7-
FROM scbexperimental/hook-sdk-nodejs:latest
8+
FROM scbexperimental/hook-sdk-nodejs:${baseImageTag:-latest}
89
WORKDIR /home/app/hook-wrapper/hook/
910
COPY --from=build --chown=app:app /home/app/node_modules/ ./node_modules/
1011
COPY --chown=app:app ./hook.js ./hook.js

0 commit comments

Comments
 (0)