Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kolla Ansible
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Very Demiurge Very Mindful
Kolla Ansible
Commits
c22af045
Commit
c22af045
authored
8 years ago
by
Jenkins
Committed by
Gerrit Code Review
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge "Add a block around oraclelinux base package install"
parents
5f0ea584
f6e84307
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker/base/Dockerfile.j2
+2
-0
2 additions, 0 deletions
docker/base/Dockerfile.j2
with
2 additions
and
0 deletions
docker/base/Dockerfile.j2
+
2
−
0
View file @
c22af045
...
@@ -114,6 +114,7 @@ RUN yum -y install \
...
@@ -114,6 +114,7 @@ RUN yum -y install \
{% if base_distro == 'oraclelinux' %}
{% if base_distro == 'oraclelinux' %}
{% block base_oraclelinux_package_installation %}
COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
RUN yum -y install \
RUN yum -y install \
tar \
tar \
...
@@ -133,6 +134,7 @@ RUN yum -y install \
...
@@ -133,6 +134,7 @@ RUN yum -y install \
&& yum -y install \
&& yum -y install \
yum-plugin-priorities \
yum-plugin-priorities \
&& yum clean all
&& yum clean all
{% endblock %}
{% endif %}
{% endif %}
{# Endif for base_distro oraclelinux #}
{# Endif for base_distro oraclelinux #}
...
...
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