Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Foreman
Commits
6e5f76e4
Unverified
Commit
6e5f76e4
authored
3 years ago
by
Ohad Levy
Committed by
Tomer Brisker
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fixes #33093 - force Fedora 33 builds due to failures on 34
(cherry picked from commit
369fc030
)
parent
9a71c367
2.4-stable
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+3
-3
Dockerfile
with
3 additions
and
3 deletions
+3
-3
Dockerfile
+
3
-
3
View file @
6e5f76e4
# Base container that is used for both building and running the app
FROM
registry.fedoraproject.org/fedora-minimal:
latest
as
base
FROM
registry.fedoraproject.org/fedora-minimal:
33
as
base
ARG
RUBY_VERSION="2.7"
ARG
NODEJS_VERSION="12"
ENV
FOREMAN_FQDN=foreman.example.com
...
...
@@ -8,7 +8,7 @@ ENV FOREMAN_DOMAIN=example.com
RUN
\
echo
-e
"[nodejs]
\n
name=nodejs
\n
stream=
${
NODEJS_VERSION
}
\n
profiles=
\n
state=enabled
\n
"
>
/etc/dnf/modules.d/nodejs.module
&&
\
echo
-e
"[ruby]
\n
name=ruby
\n
stream=
${
RUBY_VERSION
}
\n
profiles=
\n
state=enabled
\n
"
>
/etc/dnf/modules.d/ruby.module
&&
\
microdnf
install
postgresql-libs ruby
{
,gems
}
rubygem-
{
rake,bundler
}
npm nc
hostname
\
microdnf
install
-y
postgresql-libs ruby
{
,gems
}
rubygem-
{
rake,bundler
}
npm nc
hostname
\
# needed for VNC/SPICE websockets
python2-numpy && \
microdnf clean all
...
...
@@ -33,7 +33,7 @@ ENV FOREMAN_APIPIE_LANGS=en
ENV
BUNDLER_SKIPPED_GROUPS="test development openid libvirt journald facter console"
RUN
\
microdnf
install
redhat-rpm-config git
\
microdnf
install
-y
redhat-rpm-config git
\
gcc-c++ make bzip2 gettext
tar
\
libxml2-devel libcurl-devel ruby-devel
\
postgresql-devel
&&
\
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help