Using proper way to define Debian repository for Ubuntu based web-service
This commit is contained in:
parent
7061e5e18b
commit
999249248e
|
|
@ -70,7 +70,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||
smartmontools \
|
||||
sudo" && \
|
||||
microdnf -y install \
|
||||
--disableplugin=subscription-manager \
|
||||
--disablerepo="*" \
|
||||
--enablerepo="ubi-10-baseos-rpms" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
|
|
|
|||
|
|
@ -32,24 +32,24 @@ STOPSIGNAL SIGTERM
|
|||
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/sbin/zabbix_web_service /usr/sbin/zabbix_web_service
|
||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}-output/web_service/conf/ ${ZABBIX_CONF_DIR}/
|
||||
COPY conf/etc/apt/preferences.d/chromium.pref /etc/apt/preferences.d/chromium.pref
|
||||
|
||||
RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
||||
--mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
||||
set -eux && \
|
||||
INSTALL_PKGS="bash \
|
||||
ca-certificates \
|
||||
chromium \
|
||||
chromium-sandbox" && \
|
||||
INSTALL_TEMP_PKGS="gnupg dirmngr gpg gpgconf" && \
|
||||
INSTALL_SYSTEM_PKGS="ca-certificates \
|
||||
debian-archive-keyring" && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
--no-install-recommends \
|
||||
${INSTALL_TEMP_PKGS} && \
|
||||
gpg --keyserver keyserver.ubuntu.com --recv-keys 78DBA3BC47EF2265 && \
|
||||
gpg -o /etc/apt/keyrings/debian.gpg --export 78DBA3BC47EF2265 && \
|
||||
echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/debian.list && \
|
||||
echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian trixie-updates main" >> /etc/apt/sources.list.d/debian.list && \
|
||||
${INSTALL_SYSTEM_PKGS}
|
||||
|
||||
COPY conf/etc/ /etc/
|
||||
|
||||
RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
||||
--mount=type=cache,target=/var/lib/apt/,sharing=locked \
|
||||
set -eux && \
|
||||
INSTALL_PKGS="chromium \
|
||||
chromium-sandbox" && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
--no-install-recommends \
|
||||
|
|
@ -72,10 +72,6 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
|
|||
${ZABBIX_USER_HOME_DIR}/enc_internal && \
|
||||
chown --quiet -R zabbix:0 ${ZABBIX_USER_HOME_DIR}/ && \
|
||||
chmod -R g=u ${ZABBIX_USER_HOME_DIR}/ && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get purge -y \
|
||||
${INSTALL_TEMP_PKGS} && \
|
||||
rm -rf ~/.gnupg && \
|
||||
apt-get autoremove -y && \
|
||||
/usr/sbin/zabbix_web_service -V
|
||||
|
||||
RUN --mount=from=entrypoints,target=/tmp/entrypoints,ro \
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ Pin: release a=resolute
|
|||
Pin-Priority: 500
|
||||
|
||||
Package: *
|
||||
Pin: origin "deb.debian.org"
|
||||
Pin: release o=Debian
|
||||
Pin-Priority: 300
|
||||
|
||||
# Pattern includes 'chromium', 'chromium-browser' and similarly
|
||||
# named dependencies:
|
||||
Package: chromium*
|
||||
Pin: origin "deb.debian.org"
|
||||
Pin: release o=Debian
|
||||
Pin-Priority: 700
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
Types: deb
|
||||
URIs: https://deb.debian.org/debian
|
||||
Suites: trixie trixie-updates
|
||||
Components: main
|
||||
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
|
||||
|
||||
Types: deb
|
||||
URIs: https://security.debian.org/debian-security
|
||||
Suites: trixie-security
|
||||
Components: main
|
||||
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
|
||||
Loading…
Reference in a new issue