fedora-dev: switch to dnf
This commit is contained in:
parent
398f7fd419
commit
23f09aff00
2 changed files with 8 additions and 39 deletions
|
@ -1,10 +1,10 @@
|
||||||
FROM FROM_IMAGE
|
FROM FROM_IMAGE
|
||||||
|
|
||||||
RUN yum erase -y vim-minimal && \
|
RUN dnf erase -y vim-minimal
|
||||||
groupadd -g 990 docker && \
|
RUN groupadd -g 990 docker
|
||||||
yum groupinstall -y "development tools" && \
|
RUN dnf groupinstall -y "development tools"
|
||||||
yum install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
|
RUN dnf install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
|
||||||
yum-utils \
|
dnf-plugins-core \
|
||||||
git \
|
git \
|
||||||
golang \
|
golang \
|
||||||
mercurial \
|
mercurial \
|
||||||
|
@ -31,9 +31,9 @@ RUN yum erase -y vim-minimal && \
|
||||||
dbus-devel \
|
dbus-devel \
|
||||||
keychain \
|
keychain \
|
||||||
tito && \
|
tito && \
|
||||||
yum update -y && \
|
dnf update -y && \
|
||||||
yum clean all && \
|
dnf clean all
|
||||||
groupadd -g DEV_GID DEV_USER && \
|
RUN groupadd -g DEV_GID DEV_USER && \
|
||||||
useradd -m -u DEV_UID -g DEV_GID -G wheel,mock DEV_USER && \
|
useradd -m -u DEV_UID -g DEV_GID -G wheel,mock DEV_USER && \
|
||||||
sed -ri 's/^(%wheel.*)(ALL)$/\1NOPASSWD: \2/' /etc/sudoers
|
sed -ri 's/^(%wheel.*)(ALL)$/\1NOPASSWD: \2/' /etc/sudoers
|
||||||
USER DEV_USER
|
USER DEV_USER
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
FROM fedora:rawhide
|
|
||||||
|
|
||||||
RUN yum erase -y vim-minimal &&\
|
|
||||||
yum groupinstall -y "development tools" && \
|
|
||||||
yum install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
|
|
||||||
yum-utils \
|
|
||||||
git \
|
|
||||||
golang \
|
|
||||||
mercurial \
|
|
||||||
bzr \
|
|
||||||
vim-enhanced \
|
|
||||||
fedora-packager \
|
|
||||||
sudo \
|
|
||||||
screen \
|
|
||||||
libtool \
|
|
||||||
gtk-doc \
|
|
||||||
intltool \
|
|
||||||
libgcrypt-devel \
|
|
||||||
gperf \
|
|
||||||
libcap-devel \
|
|
||||||
glib2-devel \
|
|
||||||
keychain \
|
|
||||||
tito && \
|
|
||||||
yum update -y && \
|
|
||||||
yum clean all && \
|
|
||||||
useradd -m -u 1000 -G wheel,mock vbatts && \
|
|
||||||
sed -ri 's/^(%wheel.*)(ALL)$/\1NOPASSWD: \2/' /etc/sudoers
|
|
||||||
USER vbatts
|
|
||||||
ENV HOME /home/vbatts
|
|
||||||
WORKDIR /home/vbatts
|
|
||||||
CMD bash -l
|
|
Loading…
Reference in a new issue