From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Tue, 7 Feb 2023 20:36:07 +0000 (-0600)
Subject: Update Dockerfile
X-Git-Tag: 1.6.0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba9704d0ceb12d71b52f1a4149145318c45144ed;p=thirdparty%2FFORT-validator.git

Update Dockerfile
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3fae50db..4707a346 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 #--- Alpine build container ---
 FROM alpine:latest AS builder
-ARG FORT_VERSION=1.5.3
+ARG FORT_VERSION=1.5.4
 
 # Install compiler and dependencies
 RUN apk --update --no-cache add build-base autoconf automake pkgconfig jansson-dev check-dev \
@@ -22,15 +22,16 @@ FROM alpine:latest
 # Install dependencies
 RUN apk --update --no-cache add openssl jansson rsync libexecinfo tini libxml2 libcurl
 
-# Install FORT binaries
+# Install FORT
 COPY --from=builder /usr/local/bin/fort /usr/local/bin/fort
 COPY --from=builder /usr/local/share/man/man8/fort.8 /usr/local/share/man/man8/fort.8
 
 # Create required directories
-RUN mkdir -p /var/local/fort && mkdir -p /etc/fort
+RUN mkdir -p /var/local/fort && mkdir -p /etc/fort/tal
 
-# Create a default configuration file
-RUN echo '{"tal":"/etc/fort/tal","local-repository":"/var/local/fort"}' > /etc/fort/fort.conf
+# Create default configuration
+RUN yes yes | fort --init-tals --tal /etc/fort/tal
+RUN echo '{ "tal":"/etc/fort/tal", "local-repository":"/var/local/fort" }' > /etc/fort/fort.conf
 
 
 # Run FORT via TINI