Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
841d8e74
Commit
841d8e74
authored
5 years ago
by
Igor Stegarescu
Browse files
Options
Downloads
Patches
Plain Diff
RHEL 8 docker password variable
Change-Id: Iccdcabbdf4907db029b8a03dd2a1fd998c841f5d
parent
9f827709
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/Dockerfile_rhel_8
+4
-2
4 additions, 2 deletions
docker/Dockerfile_rhel_8
scripts/make-packaging-target.py
+6
-2
6 additions, 2 deletions
scripts/make-packaging-target.py
with
10 additions
and
4 deletions
docker/Dockerfile_rhel_8
+
4
−
2
View file @
841d8e74
FROM docker.io/roboxes/rhel8
RUN subscription-manager register --username=jamisfl --password=swDO9RBtTocv
ARG PASS
ENV PASS=$PASS
RUN subscription-manager register --username=jamisfl --password=$PASS
RUN subscription-manager attach --auto
RUN subscription-manager repos --enable=codeready-builder-for-rhel-8-x86_64-rpms
...
...
@@ -69,4 +72,3 @@ ADD scripts/build-package-rhel.sh /opt/build-package-rhel.sh
CMD /opt/build-package-rhel.sh
RUN subscription-manager unregister
This diff is collapsed.
Click to expand it.
scripts/make-packaging-target.py
+
6
−
2
View file @
841d8e74
...
...
@@ -61,7 +61,7 @@ QEMU_STATIC_%(distribution)s:
$(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): QEMU_STATIC_%(distribution)s docker/Dockerfile_%(docker_image)s
docker build
\\
-t $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
\\
-f docker/Dockerfile_%(docker_image)s
\\
-f docker/Dockerfile_%(docker_image)s
%(password_rhel8)s
\\
$(CURDIR)
touch $(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE)
...
...
@@ -82,9 +82,11 @@ package-%(distribution)s-interactive: $(RELEASE_TARBALL_FILENAME) packages/%(dis
"""
def
generate_target
(
distribution
,
debian_packaging_override
,
output_file
,
options
=
''
,
docker_image
=
''
,
version
=
''
,
qemu_static
=
''
):
def
generate_target
(
distribution
,
debian_packaging_override
,
output_file
,
options
=
''
,
docker_image
=
''
,
version
=
''
,
qemu_static
=
''
,
password_rhel8
=
''
):
if
(
docker_image
==
''
):
docker_image
=
distribution
if
(
docker_image
==
'
rhel_8
'
):
password_rhel8
=
password_rhel8
if
(
version
==
''
):
version
=
"
$(DEBIAN_VERSION)
"
return
target_template
%
{
...
...
@@ -95,6 +97,7 @@ def generate_target(distribution, debian_packaging_override, output_file, option
"
options
"
:
options
,
"
version
"
:
version
,
"
qemu_static
"
:
qemu_static
,
"
password_rhel8
"
:
password_rhel8
,
}
...
...
@@ -462,6 +465,7 @@ def run_generate_all(parsed_args):
"
debian_packaging_override
"
:
""
,
"
output_file
"
:
"
.packages-built
"
,
"
options
"
:
"
--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged
"
,
"
password_rhel8
"
:
"
--build-arg PASS=${PASS}
"
},
#opensuse_leap
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment