Skip to content

Commit 84cd898

Browse files
Merge pull request #17 from iExecBlockchainComputing/feature/production-certificates
Feature/production certificates
2 parents 304cfbd + a85df8e commit 84cd898

3 files changed

Lines changed: 38 additions & 13 deletions

File tree

Jenkinsfile

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@Library('global-jenkins-library@2.1.1') _
1+
@Library('global-jenkins-library@2.3.0') _
22

33
buildInfo = getBuildInfo()
44

@@ -11,14 +11,35 @@ nativeImage = buildSimpleDocker_v3(
1111
visibility: 'docker.io'
1212
)
1313

14-
buildSimpleDocker_v3(
15-
buildInfo: buildInfo,
16-
dockerfileDir: baseDir + '/gramine',
17-
buildContext: baseDir,
18-
dockerImageRepositoryName: 'tee-gramine-python-hello-world',
19-
visibility: 'iex.ec'
20-
)
21-
14+
stage('Build Gramine') {
15+
gramineBuildInfo = buildInfo.clone()
16+
dockerfileDir = baseDir + '/gramine'
17+
dockerImageRepositoryName = 'tee-python-hello-world'
18+
gramineBuildInfo.imageTag += '-gramine'
19+
visibility = 'iex.ec'
20+
productionImageName = ''
21+
stage('Build Gramine production image') {
22+
productionImageName = buildSimpleDocker_v3(
23+
buildInfo: gramineBuildInfo,
24+
dockerfileDir: dockerfileDir,
25+
buildContext: baseDir,
26+
dockerImageRepositoryName: dockerImageRepositoryName,
27+
visibility: visibility
28+
)
29+
}
30+
stage('Build Gramine test CA Gramine image') {
31+
testCaSuffix = 'test-ca'
32+
gramineBuildInfo.imageTag += '-' + testCaSuffix
33+
buildSimpleDocker_v3(
34+
buildInfo: gramineBuildInfo,
35+
dockerfileDir: dockerfileDir,
36+
dockerfileFilename: 'Dockerfile.' + testCaSuffix,
37+
dockerBuildOptions: '--build-arg BASE_IMAGE=' + productionImageName,
38+
dockerImageRepositoryName: dockerImageRepositoryName,
39+
visibility: visibility
40+
)
41+
}
42+
}
2243

2344
sconeBuildUnlocked(
2445
nativeImage: nativeImage,

cloud-computing/gramine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# FIXME: use tagged version when released
2-
FROM docker-regis.iex.ec/iexec-graphene-base:0.7.0
2+
FROM docker-regis.iex.ec/iexec-graphene-base:0.8.0
33

4-
RUN apt-get install -y python3 \
4+
RUN apt-get install -y python3 && rm -rf /var/lib/apt/lists/* \
55
&& pip3 install pyfiglet
66

77
ARG SOURCE_DIR=src
@@ -17,8 +17,7 @@ WORKDIR /workplace/app
1717

1818
# Copy the manifest to use from within the base image
1919
# or create your own
20-
RUN mv /common-manifests/python.entrypoint.manifest /entrypoint.manifest \
21-
&& rm -r /common-manifests
20+
RUN cp /common-manifests/python.entrypoint.manifest /entrypoint.manifest
2221

2322
# Finalize app (finalize manifest and sign app)
2423
RUN /finalize-app.sh
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
ARG BASE_IMAGE
2+
FROM $BASE_IMAGE
3+
ENV CA=test
4+
RUN cp /common-manifests/python.entrypoint.manifest /entrypoint.manifest
5+
RUN /finalize-app.sh

0 commit comments

Comments
 (0)