更改Dockerfile，每5小时自动拉取最新代码

kkeenee · Jul 31, 2020 · c9fb5c6 · c9fb5c6
1 parent a744f5e
commit c9fb5c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,8 @@ ARG app_env=prod
 # ARG add_user=www-data
 
 ENV APP_ENV=${app_env:-"prod"} \
-    TIMEZONE=${timezone:-"Asia/Shanghai"}
+    TIMEZONE=${timezone:-"Asia/Shanghai"} \
+    cron="0 10 * * 0"
 
 ##
 # ---------- building ----------
@@ -91,6 +92,7 @@ RUN set -ex \
         # - config timezone
         && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
         && echo "${TIMEZONE}" > /etc/timezone \
+        && echo '2 */5 * * * cd /var/www && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root \
         # ---------- some config work ----------
         # - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine)
         # && addgroup -g 82 -S ${add_user} \
@@ -103,3 +105,5 @@ RUN set -ex \
 EXPOSE 9000
 # VOLUME ["/var/www", "/data"]
 WORKDIR /var/www
+
+CMD ["sh", "-c", "/usr/bin/php /var/www/iyuu.php ; /usr/sbin/crond ; (crontab -l ;echo \"$cron /usr/bin/php /var/www/iyuu.php &> /dev/null\") | crontab - ; tail -f /dev/null"]
diff --git a/docker/AMD64/Dockerfile b/docker/AMD64/Dockerfile
@@ -16,7 +16,8 @@ ARG app_env=prod
 # ARG add_user=www-data
 
 ENV APP_ENV=${app_env:-"prod"} \
-    TIMEZONE=${timezone:-"Asia/Shanghai"}
+    TIMEZONE=${timezone:-"Asia/Shanghai"} \
+    cron="0 10 * * 0"
 
 ##
 # ---------- building ----------
@@ -91,6 +92,7 @@ RUN set -ex \
         # - config timezone
         && ln -sf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime \
         && echo "${TIMEZONE}" > /etc/timezone \
+        && echo '2 */5 * * * cd /var/www && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root \
         # ---------- some config work ----------
         # - ensure 'www-data' user exists(82 is the standard uid/gid for "www-data" in Alpine)
         # && addgroup -g 82 -S ${add_user} \
@@ -103,3 +105,5 @@ RUN set -ex \
 EXPOSE 9000
 # VOLUME ["/var/www", "/data"]
 WORKDIR /var/www
+
+CMD ["sh", "-c", "/usr/bin/php /var/www/iyuu.php ; /usr/sbin/crond ; (crontab -l ;echo \"$cron /usr/bin/php /var/www/iyuu.php &> /dev/null\") | crontab - ; tail -f /dev/null"]
diff --git a/docker/Arm64v8/Dockerfile b/docker/Arm64v8/Dockerfile
@@ -20,7 +20,8 @@ RUN set -ex \
     && apk del --purge *-dev \
     && rm -rf /var/cache/apk/* /tmp/* /usr/share/man \
     && echo "${TZ}" > /etc/timezone \
-    && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
+    && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
+    && echo '2 */6 * * * cd /IYUU && git fetch --all && git reset --hard origin/master' >> /etc/crontabs/root
 
 WORKDIR /IYUU