Revert "switch from apt-get to apt"

This reverts commit eba7e6c5f9.
This commit is contained in:
buanet
2022-11-13 20:51:11 +01:00
parent eba7e6c5f9
commit b18d22ddf8
4 changed files with 15 additions and 16 deletions

View File

@@ -1,7 +1,6 @@
## Changelog
### v7.2.0-beta.1 (coming soon)
* switch from apt-get to apt
* add env PERMISSION_CHECK ([#251](https://github.com/buanet/ioBroker.docker/issues/251))
* add some more DEBUG messages to log
* add env IOB_BACKITUP_EXTDB to unlock external db backups in backitup adapter

View File

@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
ENV DEBIAN_FRONTEND noninteractive
# Install prerequisites (including node) and generating locales
RUN apt update && apt install -y \
RUN apt-get update && apt-get install -y \
apt-utils \
cifs-utils \
curl \
@@ -32,7 +32,7 @@ RUN apt update && apt install -y \
wget \
# Install node
&& curl -sL https://deb.nodesource.com/setup_16.x | bash \
&& apt update && apt install -y nodejs \
&& apt-get update && apt-get install -y nodejs \
# Install node-gyp
&& npm install -g node-gyp \
# Generating locales
@@ -68,9 +68,9 @@ RUN mkdir -p /opt/scripts/.docker_config/ \
&& chown root:iobroker /usr/sbin/gosu \
&& chmod +s /usr/sbin/gosu \
# Clean up installation cache
&& apt autoclean -y \
&& apt autoremove \
&& apt clean \
&& apt-get autoclean -y \
&& apt-get autoremove \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* \
&& rm -rf /root/.cache/* /root/.npm/* \
&& rm -rf /var/lib/apt/lists/*

View File

@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
ENV DEBIAN_FRONTEND noninteractive
# Install prerequisites (including node) and generating locales
RUN apt update && apt install -y \
RUN apt-get update && apt-get install -y \
apt-utils \
cifs-utils \
curl \
@@ -32,7 +32,7 @@ RUN apt update && apt install -y \
wget \
# Install node
&& curl -sL https://deb.nodesource.com/setup_18.x | bash \
&& apt update && apt install -y nodejs \
&& apt-get update && apt-get install -y nodejs \
# Install node-gyp
&& npm install -g node-gyp \
# Generating locales
@@ -68,9 +68,9 @@ RUN mkdir -p /opt/scripts/.docker_config/ \
&& chown root:iobroker /usr/sbin/gosu \
&& chmod +s /usr/sbin/gosu \
# Clean up installation cache
&& apt autoclean -y \
&& apt autoremove \
&& apt clean \
&& apt-get autoclean -y \
&& apt-get autoremove \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* \
&& rm -rf /root/.cache/* /root/.npm/* \
&& rm -rf /var/lib/apt/lists/*

View File

@@ -2,13 +2,13 @@
if [ $1 == "-install" ]
then
apt -qq update
apt-get -qq update
packages=$(cat /opt/scripts/.docker_config/.packages)
for i in $packages; do
if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ];
then
echo "$i is not installed. Installing..."
sudo apt -qq -y install $i
sudo apt-get -qq -y install $i
echo "Done."
else
echo "$i is already installed."
@@ -16,15 +16,15 @@ then
done
elif [ $1 == "-update" ]
then
apt -qq update
apt -qq -y upgrade
apt-get -qq update
apt-get -qq -y upgrade
else
echo "No paramerter found!"
exit 1
fi
# Silent Cleanup
apt -qq autoclean -y && apt -qq autoremove && apt -qq clean
apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
exit 0