Skip to content

Commit 93cf974

Browse files
richiesebastianMridul Gainbharath-avesha
authored
Release v1.0.4 (#4)
* fix(): trigger build * fix(): Enable multi arch build Signed-off-by: Bharath Horatti <[email protected]> * Update Jenkinsfile * fix(): Update Jenkinsfile * fix(): Update Jenkinsfile --------- Signed-off-by: Bharath Horatti <[email protected]> Co-authored-by: Mridul Gain <[email protected]> Co-authored-by: Bharath Horatti <[email protected]>
1 parent b8b74c9 commit 93cf974

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

Jenkinsfile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
@Library('ml-library@enterprise-ml-release') _
1+
@Library('jenkins-library@opensource-release-multiarch') _
22
dockerImagePipeline(
33
script: this,
4-
serviceCython: 'openvpn-server.alpine.amd64',
5-
service: 'openvpn-client.alpine.amd64',
6-
dockerfile: 'avesha_openvpn_client.dockerfile',
7-
dockerFileCython: 'avesha_openvpn_server.dockerfile',
8-
runUnitTests: false,
4+
services: ['openvpn-server.alpine','openvpn-client.alpine'],
5+
dockerfiles: ['avesha_openvpn_server.dockerfile','avesha_openvpn_client.dockerfile'],
96
pushed: true,
10-
testArguments: 'pytest --alluredir=/workspace/allure-report test/tools/',
11-
buildContext: '.',
12-
buildArguments: [PLATFORM:"amd64"]
7+
buildArgumentsList: [
8+
[ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64'],
9+
[ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64']
10+
]
1311

1412
)

avesha_openvpn_client.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
# TODO: Add example of calling client docker with cmd line for all openvpn configuration parameters and utilizing files for crt/keys instead of an inline .ovpn file.
3434
# ####
3535

36-
ARG PLATFORM
37-
FROM ${PLATFORM}/alpine:3.20.1
36+
FROM alpine:3.20.1
3837

3938
RUN apk add --update --no-cache openvpn
4039
# Will need to add alpine GRE packages

avesha_openvpn_server.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM aveshatest/openvpn-server-base:sec-fix
1+
FROM aveshatest/openvpn-server-base:multi-arch-1.0.0
22
# this base was built from: https://github.com/kylemanna/docker-openvpn
33

44
# This docker file will be used for running the server in a container.

0 commit comments

Comments
 (0)