fix: libfaketime

lotyp · lotyp · commit 7fa1cce6d4f5 · 2022-11-25T10:27:27.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 export DOCKER_BUILDKIT ?= 1
 IMAGE_NAMESPACE ?= wayofdev/php-dev
-TEMPLATE ?= 8.0-cli-alpine
+TEMPLATE ?= 8.1-cli-alpine
 
 IMAGE_TAG ?= $(IMAGE_NAMESPACE):$(TEMPLATE)-latest
 DOCKERFILE_DIR ?= ./dist/dev/$(TEMPLATE)
diff --git a/dist/dev/7.4-cli-alpine/Dockerfile b/dist/dev/7.4-cli-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/7.4-cli-alpine/goss.yaml b/dist/dev/7.4-cli-alpine/goss.yaml
@@ -47,5 +47,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/7.4-fpm-alpine/Dockerfile b/dist/dev/7.4-fpm-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/7.4-fpm-alpine/goss.yaml b/dist/dev/7.4-fpm-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/7.4-supervisord-alpine/Dockerfile b/dist/dev/7.4-supervisord-alpine/Dockerfile
@@ -47,6 +47,8 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/dist/dev/7.4-supervisord-alpine/goss.yaml b/dist/dev/7.4-supervisord-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.0-cli-alpine/Dockerfile b/dist/dev/8.0-cli-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/8.0-cli-alpine/goss.yaml b/dist/dev/8.0-cli-alpine/goss.yaml
@@ -47,5 +47,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.0-fpm-alpine/Dockerfile b/dist/dev/8.0-fpm-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/8.0-fpm-alpine/goss.yaml b/dist/dev/8.0-fpm-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.0-supervisord-alpine/Dockerfile b/dist/dev/8.0-supervisord-alpine/Dockerfile
@@ -47,6 +47,8 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/dist/dev/8.0-supervisord-alpine/goss.yaml b/dist/dev/8.0-supervisord-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.1-cli-alpine/Dockerfile b/dist/dev/8.1-cli-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/8.1-cli-alpine/goss.yaml b/dist/dev/8.1-cli-alpine/goss.yaml
@@ -47,5 +47,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.1-fpm-alpine/Dockerfile b/dist/dev/8.1-fpm-alpine/Dockerfile
@@ -47,5 +47,7 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
diff --git a/dist/dev/8.1-fpm-alpine/goss.yaml b/dist/dev/8.1-fpm-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/dist/dev/8.1-supervisord-alpine/Dockerfile b/dist/dev/8.1-supervisord-alpine/Dockerfile
@@ -47,6 +47,8 @@ RUN set -eux; \
 
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/dist/dev/8.1-supervisord-alpine/goss.yaml b/dist/dev/8.1-supervisord-alpine/goss.yaml
@@ -55,5 +55,9 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 
 ...
diff --git a/src/Dockerfiles/dev/Dockerfile.j2 b/src/Dockerfiles/dev/Dockerfile.j2
@@ -65,6 +65,8 @@ RUN set -eux; \
 COPY --chown=www-data ./configs/99-xdebug.ini /usr/local/etc/php/conf.d/
 {% endif %}
 
+ENV LD_PRELOAD="$LD_PRELOAD /usr/lib/faketime/libfaketime.so.1"
+
 USER www-data
 
 {% if 'supervisord' == php_type %}
diff --git a/src/Dockerfiles/dev/goss.yaml.j2 b/src/Dockerfiles/dev/goss.yaml.j2
@@ -84,6 +84,10 @@ command:
     stdout:
       - "/usr/lib/faketime/libfaketime.so.1"
     exit-status: 0
+  "FAKETIME='2007-09-09 06:14:22' date":
+    stdout:
+      - "Sun Sep  9 06:14:22 UTC 2007"
+    exit-status: 0
 {% endif %}
 
 ...
