Skip to content

Commit

Permalink
Release v1.0.4 (#4)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
3 people authored Nov 13, 2024
1 parent b8b74c9 commit 93cf974
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
16 changes: 7 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
@Library('ml-library@enterprise-ml-release') _
@Library('jenkins-library@opensource-release-multiarch') _
dockerImagePipeline(
script: this,
serviceCython: 'openvpn-server.alpine.amd64',
service: 'openvpn-client.alpine.amd64',
dockerfile: 'avesha_openvpn_client.dockerfile',
dockerFileCython: 'avesha_openvpn_server.dockerfile',
runUnitTests: false,
services: ['openvpn-server.alpine','openvpn-client.alpine'],
dockerfiles: ['avesha_openvpn_server.dockerfile','avesha_openvpn_client.dockerfile'],
pushed: true,
testArguments: 'pytest --alluredir=/workspace/allure-report test/tools/',
buildContext: '.',
buildArguments: [PLATFORM:"amd64"]
buildArgumentsList: [
[ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64'],
[ENV: 'production', PLATFORM: 'linux/arm64,linux/amd64']
]

)
3 changes: 1 addition & 2 deletions avesha_openvpn_client.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
# 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.
# ####

ARG PLATFORM
FROM ${PLATFORM}/alpine:3.20.1
FROM alpine:3.20.1

RUN apk add --update --no-cache openvpn
# Will need to add alpine GRE packages
Expand Down
2 changes: 1 addition & 1 deletion avesha_openvpn_server.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM aveshatest/openvpn-server-base:sec-fix
FROM aveshatest/openvpn-server-base:multi-arch-1.0.0
# this base was built from: https://github.com/kylemanna/docker-openvpn

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

0 comments on commit 93cf974

Please sign in to comment.