various updates
Some checks failed
Build images / build-images-amd64 (push) Failing after 6m55s
Build images / build-images-arm64 (push) Failing after 8m18s
Build images / update-images-manifests (push) Has been skipped

This commit is contained in:
Maciej Lebiest 2024-03-20 22:17:33 +01:00
parent a276eebb22
commit b622342887
4 changed files with 14 additions and 19 deletions

View file

@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora-minimal:39 FROM registry.fedoraproject.org/fedora-minimal
USER root USER root

View file

@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:39 FROM registry.fedoraproject.org/fedora-minimal
ENV HISTSIZE=10000 ENV HISTSIZE=10000
ENV HISTTIMEFORMAT="%d/%m/%y %T " ENV HISTTIMEFORMAT="%d/%m/%y %T "
@ -19,16 +19,13 @@ ENV GENERAL_PKGS="\
ENV APPS="\ ENV APPS="\
chromium \ chromium \
firefox \ firefox"
librewolf"
# install dependencies and basic apps # install dependencies and basic apps
RUN dnf install -y 'dnf-command(config-manager)' && \ RUN dnf5 install -y \
dnf config-manager --add-repo https://rpm.librewolf.net/librewolf-repo.repo && \
dnf install -y \
${GENERAL_PKGS} \ ${GENERAL_PKGS} \
${APPS} \ ${APPS} \
&& dnf clean all && dnf5 clean all
RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc

View file

@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora-minimal:39 FROM registry.fedoraproject.org/fedora-minimal
ENV VIRTUAL_ENV=/venv ENV VIRTUAL_ENV=/venv
ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

View file

@ -1,21 +1,19 @@
FROM registry.fedoraproject.org/fedora:39 FROM registry.fedoraproject.org/fedora-minimal
RUN useradd -u 1423 -m -s '/bin/bash' -U snowflake
ENV TZ=Europe/Warsaw ENV TZ=Europe/Warsaw
RUN dnf5 install -y shadow-utils git golang && \
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \ useradd -u 1423 -m -s '/bin/bash' -U snowflake && \
dnf clean all && \ ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
dnf install -y git golang && \
git clone https://git.torproject.org/pluggable-transports/snowflake.git && \ git clone https://git.torproject.org/pluggable-transports/snowflake.git && \
cd snowflake/proxy && \ cd snowflake/proxy && \
go build && \ go build && \
dnf remove -y golang git && \ dnf5 remove -y golang git shadow-utils && \
dnf -y autoremove && \ dnf5 -y autoremove && \
dnf -y clean all && \ dnf5 -y clean all && \
mv /snowflake/proxy/proxy /usr/bin/proxy && \ mv /snowflake/proxy/proxy /usr/bin/proxy && \
cd / && \ cd / && \
rm -rf /snowflake /root/* && \ rm -rf /snowflake /root/* && \
chown snowflake.snowflake /usr/bin/proxy chown snowflake:snowflake /usr/bin/proxy
USER snowflake USER snowflake