Release 3.2.2 - See CHANGELOG.md

tiredofit · Oct 4, 2022 · c84f7c9 · c84f7c9
1 parent 249c10a
commit c84f7c9
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.2.2 2022-10-04 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change the way git clone operation works in Dockerfile
+
+
 ## 3.2.1 2022-08-17 <dave at tiredofit dot ca>
 
    ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -8,53 +8,51 @@ ENV TINC_VERSION=latest \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-tinc/"
 
 ### Dependencies Installation
-RUN set -x && \
-	apk update && \
-	apk upgrade && \
-	apk add -t .tinc-build-deps \
-						autoconf \
-						build-base \
-						curl \
-						g++ \
-						gcc \
-						libc-utils \
-						libpcap-dev \
-						linux-headers \
-						lz4-dev \
-						lzo-dev \
-						make \
-						meson \
-						ninja \
-						ncurses-dev \
-						libressl-dev \
-						readline-dev \
-						tar \
-						zlib-dev \
-						&& \
+RUN source /assets/functions/00-container && \
+    set -x && \
+    apk update && \
+    apk upgrade && \
+    apk add -t .tinc-build-deps \
+				autoconf \
+				build-base \
+				curl \
+				g++ \
+				gcc \
+				libc-utils \
+				libpcap-dev \
+				linux-headers \
+				lz4-dev \
+				lzo-dev \
+				make \
+				meson \
+				ninja \
+				ncurses-dev \
+				libressl-dev \
+				readline-dev \
+				tar \
+				zlib-dev \
+				&& \
 	\
-	apk add -t .tinc-run-deps \
-						ca-certificates \
-						git \
-						inotify-tools \
-						libcrypto1.1 \
-						libpcap \
-						lz4 \
-						lz4-libs \
-						lzo \
-						libressl \
-						ncurses \
-						readline \
-						zlib && \
+    apk add -t .tinc-run-deps \
+				ca-certificates \
+				git \
+				inotify-tools \
+				libcrypto1.1 \
+				libpcap \
+				lz4 \
+				lz4-libs \
+				lzo \
+				libressl \
+				ncurses \
+				readline \
+				zlib && \
 	\
-	mkdir -p /usr/src/tinc && \
-	git clone https://github.com/gsliepen/tinc /usr/src/tinc && \
-	cd /usr/src/tinc && \
-	git checkout ${TINC_VERSION} && \
+	clone_git_repo https://github.com/gsliepen/tinc ${TINC_VERSION} && \
 	meson setup builddir -Dprefix=/usr -Dsysconfdir=/etc -Djumbograms=true -Dtunemu=enabled -Dbuildtype=release && \
 	meson compile -C builddir && \
 	meson install -C builddir && \
 	apk del --no-cache --purge .tinc-build-deps && \
-	mkdir /var/log/tinc && \
+	mkdir -p /var/log/tinc && \
 	rm -rf /etc/logrotate.d/* && \
 	rm -rf /usr/src/* && \
 	rm -rf /var/cache/apk/*