Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-UDR
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-UDR
Commits
9844b81b
Commit
9844b81b
authored
Apr 17, 2022
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ci): no need to git proxy in new infra
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
3557bb22
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ci-scripts/Jenkinsfile-GitLab-Docker
ci-scripts/Jenkinsfile-GitLab-Docker
+2
-2
docker/Dockerfile.udr.rhel8
docker/Dockerfile.udr.rhel8
+2
-2
docker/Dockerfile.udr.ubuntu18
docker/Dockerfile.udr.ubuntu18
+2
-2
No files found.
ci-scripts/Jenkinsfile-GitLab-Docker
View file @
9844b81b
...
@@ -184,7 +184,7 @@ pipeline {
...
@@ -184,7 +184,7 @@ pipeline {
echo
"Maybe a previous build went wrong"
echo
"Maybe a previous build went wrong"
}
}
// In case of push to `develop` branch we build from scratch
// In case of push to `develop` branch we build from scratch
myShCmd
(
'docker build --no-cache --target oai-udr --tag oai-udr:'
+
udr_tag
+
' --file docker/Dockerfile.udr.ubuntu18
--build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080"
. > archives/udr_docker_image_build.log 2>&1'
,
rem_u18_host_flag
,
rem_u18_host_user
,
rem_u18_host
)
myShCmd
(
'docker build --no-cache --target oai-udr --tag oai-udr:'
+
udr_tag
+
' --file docker/Dockerfile.udr.ubuntu18 . > archives/udr_docker_image_build.log 2>&1'
,
rem_u18_host_flag
,
rem_u18_host_user
,
rem_u18_host
)
}
}
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
if
(
"MERGE"
.
equals
(
env
.
gitlabActionType
))
{
try
{
try
{
...
@@ -248,7 +248,7 @@ pipeline {
...
@@ -248,7 +248,7 @@ pipeline {
myShCmd
(
'cp /etc/pki/entitlement/*pem ./etc-pki-entitlement'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'cp /etc/pki/entitlement/*pem ./etc-pki-entitlement'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo cp /etc/rhsm/ca/*pem ./rhsm-ca'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo cp /etc/rhsm/ca/*pem ./rhsm-ca'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo podman build --no-cache --target oai-udr --tag oai-udr:'
+
udr_tag
+
' --file docker/Dockerfile.udr.rhel8
--build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080"
. > archives/udr_podman_image_build.log 2>&1'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'sudo podman build --no-cache --target oai-udr --tag oai-udr:'
+
udr_tag
+
' --file docker/Dockerfile.udr.rhel8 . > archives/udr_podman_image_build.log 2>&1'
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
// Putting a place holder to try out on the flattening of image.
// Putting a place holder to try out on the flattening of image.
// If not satisfactory, we can remove it.
// If not satisfactory, we can remove it.
myShCmd
(
'python3 ./ci-scripts/flatten_image.py --tag oai-udr:'
+
udr_tag
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
myShCmd
(
'python3 ./ci-scripts/flatten_image.py --tag oai-udr:'
+
udr_tag
,
rem_rhel_host_flag
,
rem_rhel_host_user
,
rem_rhel_host
)
...
...
docker/Dockerfile.udr.rhel8
View file @
9844b81b
...
@@ -57,8 +57,8 @@ RUN rm -f /etc/rhsm-host && \
...
@@ -57,8 +57,8 @@ RUN rm -f /etc/rhsm-host && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
# Some GIT configuration command quite useful
# Some GIT configuration command quite useful
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
&& \
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
git config --global https.postBuffer 123289600 && \
RUN
git config --global https.postBuffer 123289600 && \
git config --global http.sslverify false
git config --global http.sslverify false
# Copying source code
# Copying source code
...
...
docker/Dockerfile.udr.ubuntu18
View file @
9844b81b
...
@@ -43,8 +43,8 @@ RUN apt-get update && \
...
@@ -43,8 +43,8 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/*
# Some GIT configuration command quite useful
# Some GIT configuration command quite useful
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
&& \
RUN /bin/bash -c "if [[ -v NEEDED_GIT_PROXY ]]; then git config --global http.proxy $NEEDED_GIT_PROXY; fi"
git config --global https.postBuffer 123289600 && \
RUN
git config --global https.postBuffer 123289600 && \
git config --global http.sslverify false
git config --global http.sslverify false
# Copying source code
# Copying source code
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment