Skip to content

Commit

Permalink
fix[Dockerfile]: remove installing of special cpan modules.
Browse files Browse the repository at this point in the history 
Cleanup the file
  • Loading branch information
@sidey79
sidey79 committed Mar 3, 2024
1 parent b492c82 commit 580ba3b
Showing 1 changed file with 4 additions and 197 deletions.
201 changes: 4 additions & 197 deletions Dockerfile-bullseye
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#syntax=docker/dockerfile:1
# syntax=docker/dockerfile:1
ARG BASE_IMAGE="debian"
ARG BASE_IMAGE_TAG="bullseye"
FROM perl:5.36.3-bullseye as bullseye_base
Expand Down Expand Up @@ -109,26 +109,6 @@ RUN <<EOF
EOF


# Add some more Additional CPAN Modules
RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive \
cpanm --notest \
Alien::Base::ModuleBuild \
Alien::Sodium@1.0.8.0 \
Crypt::Argon2 \
Crypt::OpenSSL::AES \
Crypt::NaCl::Sodium \
Device::SMBus \
Net::MQTT::Constants \
Net::MQTT::Simple \
Net::WebSocket::Server \
&& rm -rf /root/.cpanm

# FROM bullseye_base as bullseye_extendet

####
# && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/*

# Custom image layers options:
ARG IMAGE_LAYER_SYS_EXT="1"

Expand Down Expand Up @@ -159,144 +139,6 @@ RUN if [ "${IMAGE_LAYER_SYS_EXT}" != "0" ]; then \
; fi


# Custom image layers options:
# ARG IMAGE_LAYER_PERL_EXT="1"

# # Add Perl extended app layer for pre-compiled packages
# RUN if [ "${IMAGE_LAYER_PERL_EXT}" != "0" ]; then \
# LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update \
# && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
# libalgorithm-merge-perl \
# libcrypt-eksblowfish-perl \
# libcrypt-format-perl \
# libcrypt-gcrypt-perl \
# libcrypt-generatepassword-perl \
# libcrypt-hcesha-perl \
# libcrypt-jwt-perl \
# libcrypt-mysql-perl \
# libcrypt-openssl-bignum-perl \
# libcrypt-openssl-dsa-perl \
# libcrypt-openssl-ec-perl \
# libcrypt-openssl-pkcs10-perl \
# libcrypt-openssl-pkcs12-perl \
# libcrypt-openssl-random-perl \
# libcrypt-openssl-rsa-perl \
# libcrypt-openssl-x509-perl \
# libcrypt-passwdmd5-perl \
# libcrypt-pbkdf2-perl \
# libcrypt-random-seed-perl \
# libcrypt-random-source-perl \
# libcrypt-rc4-perl \
# libcrypt-rijndael-perl \
# libcrypt-rsa-parse-perl \
# libcrypt-saltedhash-perl \
# libcrypt-simple-perl \
# libcrypt-smbhash-perl \
# libcrypt-smime-perl \
# libcrypt-ssleay-perl \
# libcrypt-twofish-perl \
# libcrypt-u2f-server-perl \
# libcrypt-unixcrypt-perl \
# libcrypt-unixcrypt-xs-perl \
# libcrypt-urandom-perl \
# libcrypt-util-perl \
# libcrypt-x509-perl \
# libcryptx-perl \
# libdata-dump-perl \
# libdatetime-format-strptime-perl \
# libdatetime-perl \
# libdevel-size-perl \
# libdigest-bcrypt-perl \
# libdigest-bubblebabble-perl \
# libdigest-crc-perl \
# libdigest-elf-perl \
# libdigest-hmac-perl \
# libdigest-jhash-perl \
# libdigest-md2-perl \
# libdigest-md4-perl \
# libdigest-md5-file-perl \
# libdigest-perl-md5-perl \
# libdigest-sha-perl \
# libdigest-sha3-perl \
# libdigest-ssdeep-perl \
# libdigest-whirlpool-perl \
# libdpkg-perl \
# libencode-perl \
# liberror-perl \
# libev-perl \
# libextutils-makemaker-cpanfile-perl \
# libfile-copy-recursive-perl \
# libfile-fcntllock-perl \
# libfinance-quote-perl \
# libgnupg-interface-perl \
# libhtml-strip-perl \
# libhtml-treebuilder-xpath-perl \
# libio-socket-inet6-perl \
# libio-socket-ip-perl \
# libio-socket-multicast-perl \
# libio-socket-portstate-perl \
# libio-socket-socks-perl \
# libio-socket-ssl-perl \
# libio-socket-timeout-perl \
# liblinux-inotify2-perl \
# libmath-round-perl \
# libmodule-pluggable-perl \
# libmojolicious-perl \
# libmoose-perl \
# libmoox-late-perl \
# libmp3-info-perl \
# libmp3-tag-perl \
# libnet-address-ip-local-perl \
# libnet-bonjour-perl \
# libnet-jabber-perl \
# libnet-oauth-perl \
# libnet-oauth2-perl \
# libnet-sip-perl \
# libnet-snmp-perl \
# libnet-ssleay-perl \
# libnet-telnet-perl \
# libnet-xmpp-perl \
# libnmap-parser-perl \
# librivescript-perl \
# librpc-xml-perl \
# libsnmp-perl \
# libsnmp-session-perl \
# libsoap-lite-perl \
# libsocket-perl \
# libswitch-perl \
# libsys-hostname-long-perl \
# libsys-statistics-linux-perl \
# libterm-readkey-perl \
# libterm-readline-perl-perl \
# libtime-period-perl \
# libtypes-path-tiny-perl \
# liburi-escape-xs-perl \
# libprotocol-websocket-perl \
# perl \
# && LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/* \
# ; fi

# Custom image layers options:
# ARG IMAGE_LAYER_DEV="1"

# # Add development/compilation layer
# RUN if [ "${IMAGE_LAYER_DEV}" != "0" ] || [ "${IMAGE_LAYER_PERL_CPAN}" != "0" ] || [ "${IMAGE_LAYER_PERL_CPAN_EXT}" != "0" ] || [ "${IMAGE_LAYER_PYTHON}" != "0" ] || [ "${IMAGE_LAYER_PYTHON_EXT}" != "0" ] || [ "${IMAGE_LAYER_NODEJS}" != "0" ] || [ "${IMAGE_LAYER_NODEJS_EXT}" != "0" ]; then \
# LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get update \
# && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
# autoconf \
# automake \
# build-essential \
# libavahi-compat-libdnssd-dev \
# libdb-dev \
# libsodium-dev \
# libssl-dev \
# libtool \
# libusb-1.0-0-dev \
# patch \
# && LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/* \
# ; fi


# Custom image layers options:
Expand All @@ -306,41 +148,6 @@ ARG IMAGE_LAYER_PERL_CPAN_EXT="1"
# Custom installation packages
ARG CPAN_PKGS=""

# Add Perl app layer for self-compiled modules
# * exclude any ARM platforms due to long build time
# * manually pre-compiled ARM packages may be applied here
# RUN if [ "${CPAN_PKGS}" != "" ] || [ "${PIP_PKGS}" != "" ] || [ "${IMAGE_LAYER_PERL_CPAN}" != "0" ] || [ "${IMAGE_LAYER_PERL_CPAN_EXT}" != "0" ] || [ "${IMAGE_LAYER_PYTHON}" != "0" ] || [ "${IMAGE_LAYER_PYTHON_EXT}" != "0" ]; then \
# # curl --retry 3 --retry-connrefused --retry-delay 2 -fsSL https://git.io/cpanm | perl - App::cpanminus \
# # && \
# cpanm --notest \
# App::cpanoutdated \
# CPAN::Plugin::Sysdeps \
# Perl::PrereqScanner::NotQuiteLite \
# Readonly \
# && if [ "${CPAN_PKGS}" != "" ]; then \
# cpanm \
# ${CPAN_PKGS} \
# ; fi \
# && if [ "${IMAGE_LAYER_PERL_CPAN_EXT}" != "0" ]; then \
# if [ "${TARGETPLATFORM}" = "linux/amd64" ] || [ "${TARGETPLATFORM}" = "linux/i386" ]; then \
# cpanm --notest \
# Alien::Base::ModuleBuild \
# Alien::Sodium@1.0.8.0 \
# Crypt::Argon2 \
# Crypt::OpenSSL::AES \
# Crypt::NaCl::Sodium \
# Device::SMBus \
# Net::MQTT::Constants \
# Net::MQTT::Simple \
# Net::WebSocket::Server \
# Device::Firmata \
# ; fi \
# ; fi \
# && rm -rf /root/.cpanm \
# && LC_ALL=C apt-get autoremove -qqy && LC_ALL=C apt-get clean \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ~/.[^.] ~/.??* ~/* \
# ; fi

# Custom image layers options:
ARG IMAGE_LAYER_PYTHON="1"
ARG IMAGE_LAYER_PYTHON_EXT="1"
Expand Down Expand Up @@ -419,8 +226,8 @@ COPY src/find-* /usr/local/bin/
# Note: Manual checkout is required if build is not run by Github Actions workflow:
# svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk

COPY src/fhem/trunk/fhem/ /fhem/
#COPY src/FHEM/trunk/fhem/* /fhem/
#COPY src/fhem/trunk/fhem/ /fhem/
COPY src/FHEM/trunk/fhem/* /fhem/
COPY src/FHEM/99_DockerImageInfo.pm /fhem/FHEM

# FHEM specific ENVs
Expand Down Expand Up @@ -455,7 +262,7 @@ ARG L_VCS_URL="https://github.com/fhem/fhem-docker/"
ARG L_VENDOR="FHEM"
ARG L_LICENSES="MIT"
ARG L_TITLE="fhem-${TARGETPLATFORM}"
ARG L_DESCR="A basic Docker image for FHEM house automation system, based on Debian Bullseye."
ARG L_DESCR="A basic Docker image for FHEM house automation system, based on Debian Bullseye Perl image."

ARG L_AUTHORS_FHEM="https://fhem.de/MAINTAINER.txt"
ARG L_URL_FHEM="https://fhem.de/"
Expand Down

0 comments on commit 580ba3b

Please sign in to comment.