Keep git and jq for ansible needs

This commit is contained in:
KemoNine 2020-08-04 06:26:28 +00:00
parent bc12007430
commit 20c05b55a8

View file

@ -11,7 +11,7 @@ COPY piframefleet/arch_detect.sh /opt/
# Install and base setup all the things # Install and base setup all the things
RUN apt update && apt upgrade -y && \ RUN apt update && apt upgrade -y && \
apt install -y python3 curl jq bash unzip nano && \ apt install -y python3 curl jq bash unzip nano git && \
ARCH=$(/opt/arch_detect.sh); \ ARCH=$(/opt/arch_detect.sh); \
echo "**** Detected arch: $ARCH ****" && \ echo "**** Detected arch: $ARCH ****" && \
S6_RELEASE=$(curl -sX GET "https://api.github.com/repos/just-containers/s6-overlay/tags" \ S6_RELEASE=$(curl -sX GET "https://api.github.com/repos/just-containers/s6-overlay/tags" \
@ -23,7 +23,7 @@ RUN apt update && apt upgrade -y && \
tar xzf /opt/s6-overlay.tar.gz -C / --exclude="./bin" && \ tar xzf /opt/s6-overlay.tar.gz -C / --exclude="./bin" && \
tar xzf /opt/s6-overlay.tar.gz -C /usr ./bin && \ tar xzf /opt/s6-overlay.tar.gz -C /usr ./bin && \
echo "**** wireguard ****" && \ echo "**** wireguard ****" && \
apt install -y git build-essential ifupdown iproute2 iptables iputils-ping libc6 libelf-dev pkg-config && \ apt install -y build-essential ifupdown iproute2 iptables iputils-ping libc6 libelf-dev pkg-config && \
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \ WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
| jq -r .[0].name); \ | jq -r .[0].name); \
git clone https://git.zx2c4.com/wireguard-tools /opt/wireguard-tools && \ git clone https://git.zx2c4.com/wireguard-tools /opt/wireguard-tools && \
@ -47,7 +47,7 @@ RUN apt update && apt upgrade -y && \
rm /opt/arch_detect.sh rm /opt/arch_detect.sh
rm /opt/s6-overlay.tar.gz && \ rm /opt/s6-overlay.tar.gz && \
rm -rf /opt/wireguard-tools && \ rm -rf /opt/wireguard-tools && \
apt remove --purge -y git build-essential pkg-config libelf-dev jq unzip && \ apt remove --purge -y build-essential pkg-config libelf-dev unzip && \
apt autoremove --purge -y && \ apt autoremove --purge -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*