Skip to content

Commit 20088de

Browse files
carlalexandercarlalexander
committed
fix: fix missing transient dependencies and autoloader paths in zip layers
1 parent 9477e9f commit 20088de

11 files changed

Lines changed: 201 additions & 110 deletions

File tree

‎runtime/php-72/Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,23 +85,24 @@ RUN git clone https://github.com/ymirapp/php-runtime.git /tmp/runtime-build && c
8585
&& chmod 0555 /opt/bootstrap /opt/runtime.php && /opt/ymir/bin/php /opt/ymir/bin/composer install --no-dev
8686

8787
# Layer Assembly
88-
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/ymir/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d
88+
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d && rm -rf /tmp/layer/ymir/lib && ln -s ../lib /tmp/layer/ymir/lib
8989
RUN cp ${INSTALL_DIR}/bin/php /tmp/layer/ymir/bin/php && cp ${INSTALL_DIR}/sbin/php-fpm /tmp/layer/ymir/bin/php-fpm && cp ${INSTALL_DIR}/bin/composer /tmp/layer/ymir/bin/composer
9090
RUN ln -s ../ymir/bin/php /tmp/layer/bin/php && ln -s ../ymir/bin/php-fpm /tmp/layer/bin/php-fpm && ln -s ../ymir/bin/composer /tmp/layer/bin/composer
91-
RUN PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && mkdir -p /tmp/layer/ymir/lib/php/extensions && cp -R ${PHP_EXT_DIR} /tmp/layer/ymir/lib/php/extensions/
91+
RUN PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && mkdir -p /tmp/layer/lib/php/extensions && cp -R ${PHP_EXT_DIR} /tmp/layer/lib/php/extensions/
9292
RUN cp -R ${INSTALL_DIR}/etc/php/conf.d/* /tmp/layer/ymir/etc/php/conf.d/ || true
93-
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/ymir/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/ymir/lib/ || true && \
94-
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/ymir/lib/
93+
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/lib/ || true && \
94+
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/lib/
9595
COPY shared/copy-dependencies.php /tmp/copy-dependencies.php
96-
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/ymir/lib && \
97-
PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/lib/php/extensions/$(basename ${PHP_EXT_DIR}) /tmp/layer/ymir/lib
98-
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/ymir/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
96+
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/lib && \
97+
PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/lib/php/extensions/$(basename ${PHP_EXT_DIR}) /tmp/layer/lib
98+
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
9999
COPY shared/php.ini /tmp/layer/ymir/etc/php/php.ini
100100
COPY shared/php-fpm.conf /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
101101
RUN sed -i '/extension=msgpack.so/d' /tmp/layer/ymir/etc/php/php.ini && \
102102
sed -i '/decorate_workers_output = no/d' /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
103103

104104
FROM --platform=${DOCKER_PLATFORM} public.ecr.aws/lambda/provided:al2023-${CPU_ARCHITECTURE}
105-
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/ymir/lib"
106-
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/vendor /opt/
105+
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/lib"
106+
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/
107+
COPY --from=build-environment /opt/vendor /opt/vendor
107108
COPY --from=build-environment /tmp/layer /opt

‎runtime/php-73/Dockerfile‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,23 @@ RUN git clone https://github.com/ymirapp/php-runtime.git /tmp/runtime-build && c
8585
&& chmod 0555 /opt/bootstrap /opt/runtime.php && /opt/ymir/bin/php /opt/ymir/bin/composer install --no-dev
8686

8787
# Layer Assembly
88-
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/ymir/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d
88+
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d && rm -rf /tmp/layer/ymir/lib && ln -s ../lib /tmp/layer/ymir/lib
8989
RUN cp ${INSTALL_DIR}/bin/php /tmp/layer/ymir/bin/php && cp ${INSTALL_DIR}/sbin/php-fpm /tmp/layer/ymir/bin/php-fpm && cp ${INSTALL_DIR}/bin/composer /tmp/layer/ymir/bin/composer
9090
RUN ln -s ../ymir/bin/php /tmp/layer/bin/php && ln -s ../ymir/bin/php-fpm /tmp/layer/bin/php-fpm && ln -s ../ymir/bin/composer /tmp/layer/bin/composer
91-
RUN PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && mkdir -p /tmp/layer/ymir/lib/php/extensions && cp -R ${PHP_EXT_DIR} /tmp/layer/ymir/lib/php/extensions/
91+
RUN PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && mkdir -p /tmp/layer/lib/php/extensions && cp -R ${PHP_EXT_DIR} /tmp/layer/lib/php/extensions/
9292
RUN cp -R ${INSTALL_DIR}/etc/php/conf.d/* /tmp/layer/ymir/etc/php/conf.d/ || true
93-
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/ymir/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/ymir/lib/ || true && \
94-
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/ymir/lib/
93+
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/lib/ || true && \
94+
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/lib/
9595
COPY shared/copy-dependencies.php /tmp/copy-dependencies.php
96-
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/ymir/lib && \
97-
PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/lib/php/extensions/$(basename ${PHP_EXT_DIR}) /tmp/layer/ymir/lib
98-
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/ymir/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
96+
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/lib && \
97+
PHP_EXT_DIR=$(${INSTALL_DIR}/bin/php-config --extension-dir) && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/lib/php/extensions/$(basename ${PHP_EXT_DIR}) /tmp/layer/lib
98+
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
9999
COPY shared/php.ini /tmp/layer/ymir/etc/php/php.ini
100100
COPY shared/php-fpm.conf /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
101101
RUN sed -i '/extension=msgpack.so/d' /tmp/layer/ymir/etc/php/php.ini
102102

103103
FROM --platform=${DOCKER_PLATFORM} public.ecr.aws/lambda/provided:al2023-${CPU_ARCHITECTURE}
104-
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/ymir/lib"
105-
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/vendor /opt/
104+
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/lib"
105+
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/
106+
COPY --from=build-environment /opt/vendor /opt/vendor
106107
COPY --from=build-environment /tmp/layer /opt

‎runtime/php-74/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,21 @@ RUN git clone https://github.com/ymirapp/php-runtime.git /tmp/runtime-build && c
8686
&& chmod 0555 /opt/bootstrap /opt/runtime.php && /opt/ymir/bin/php /opt/ymir/bin/composer install --no-dev
8787

8888
# Layer Assembly
89-
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/ymir/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d
89+
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d && rm -rf /tmp/layer/ymir/lib && ln -s ../lib /tmp/layer/ymir/lib
9090
RUN cp ${INSTALL_DIR}/bin/php /tmp/layer/ymir/bin/php && cp ${INSTALL_DIR}/sbin/php-fpm /tmp/layer/ymir/bin/php-fpm && cp ${INSTALL_DIR}/bin/composer /tmp/layer/ymir/bin/composer
9191
RUN ln -s ../ymir/bin/php /tmp/layer/bin/php && ln -s ../ymir/bin/php-fpm /tmp/layer/bin/php-fpm && ln -s ../ymir/bin/composer /tmp/layer/bin/composer
92-
RUN mkdir -p /tmp/layer/ymir/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/ymir/lib/php/extensions/
92+
RUN mkdir -p /tmp/layer/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/lib/php/extensions/
9393
RUN cp ${INSTALL_DIR}/etc/php/conf.d/* /tmp/layer/ymir/etc/php/conf.d/
94-
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/ymir/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/ymir/lib/ || true && \
95-
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/ymir/lib/
94+
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/lib/ || true && \
95+
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/lib/
9696
COPY shared/copy-dependencies.php /tmp/copy-dependencies.php
97-
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/ymir/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/lib/php/extensions /tmp/layer/ymir/lib
98-
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/ymir/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
97+
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/lib/php/extensions /tmp/layer/lib
98+
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
9999
COPY shared/php.ini /tmp/layer/ymir/etc/php/php.ini
100100
COPY shared/php-fpm.conf /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
101101

102102
FROM --platform=${DOCKER_PLATFORM} public.ecr.aws/lambda/provided:al2023-${CPU_ARCHITECTURE}
103-
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/ymir/lib"
104-
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/vendor /opt/
103+
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/lib"
104+
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/
105+
COPY --from=build-environment /opt/vendor /opt/vendor
105106
COPY --from=build-environment /tmp/layer /opt

‎runtime/php-80/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,21 @@ RUN git clone https://github.com/ymirapp/php-runtime.git /tmp/runtime-build && c
8686
&& chmod 0555 /opt/bootstrap /opt/runtime.php && /opt/ymir/bin/php /opt/ymir/bin/composer install --no-dev
8787

8888
# Layer Assembly
89-
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/ymir/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d
89+
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d && rm -rf /tmp/layer/ymir/lib && ln -s ../lib /tmp/layer/ymir/lib
9090
RUN cp ${INSTALL_DIR}/bin/php /tmp/layer/ymir/bin/php && cp ${INSTALL_DIR}/sbin/php-fpm /tmp/layer/ymir/bin/php-fpm && cp ${INSTALL_DIR}/bin/composer /tmp/layer/ymir/bin/composer
9191
RUN ln -s ../ymir/bin/php /tmp/layer/bin/php && ln -s ../ymir/bin/php-fpm /tmp/layer/bin/php-fpm && ln -s ../ymir/bin/composer /tmp/layer/bin/composer
92-
RUN mkdir -p /tmp/layer/ymir/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/ymir/lib/php/extensions/
92+
RUN mkdir -p /tmp/layer/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/lib/php/extensions/
9393
RUN cp ${INSTALL_DIR}/etc/php/conf.d/* /tmp/layer/ymir/etc/php/conf.d/
94-
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/ymir/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/ymir/lib/ || true && \
95-
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/ymir/lib/
94+
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/lib/ || true && \
95+
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/lib/
9696
COPY shared/copy-dependencies.php /tmp/copy-dependencies.php
97-
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/ymir/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/lib/php/extensions /tmp/layer/ymir/lib
98-
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/ymir/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
97+
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/lib/php/extensions /tmp/layer/lib
98+
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
9999
COPY shared/php.ini /tmp/layer/ymir/etc/php/php.ini
100100
COPY shared/php-fpm.conf /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
101101

102102
FROM --platform=${DOCKER_PLATFORM} public.ecr.aws/lambda/provided:al2023-${CPU_ARCHITECTURE}
103-
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/ymir/lib"
104-
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/vendor /opt/
103+
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/lib"
104+
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/
105+
COPY --from=build-environment /opt/vendor /opt/vendor
105106
COPY --from=build-environment /tmp/layer /opt

‎runtime/php-81/Dockerfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,20 +84,21 @@ RUN git clone https://github.com/ymirapp/php-runtime.git /tmp/runtime-build && c
8484
&& chmod 0555 /opt/bootstrap /opt/runtime.php && /opt/ymir/bin/php /opt/ymir/bin/composer install --no-dev
8585

8686
# Layer Assembly
87-
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/ymir/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d
87+
RUN mkdir -p /tmp/layer/bin /tmp/layer/ymir/bin /tmp/layer/lib /tmp/layer/ymir/etc/php/conf.d /tmp/layer/ymir/etc/php-fpm.d && rm -rf /tmp/layer/ymir/lib && ln -s ../lib /tmp/layer/ymir/lib
8888
RUN cp ${INSTALL_DIR}/bin/php /tmp/layer/ymir/bin/php && cp ${INSTALL_DIR}/sbin/php-fpm /tmp/layer/ymir/bin/php-fpm && cp ${INSTALL_DIR}/bin/composer /tmp/layer/ymir/bin/composer
8989
RUN ln -s ../ymir/bin/php /tmp/layer/bin/php && ln -s ../ymir/bin/php-fpm /tmp/layer/bin/php-fpm && ln -s ../ymir/bin/composer /tmp/layer/bin/composer
90-
RUN mkdir -p /tmp/layer/ymir/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/ymir/lib/php/extensions/
90+
RUN mkdir -p /tmp/layer/lib/php/extensions && cp -R ${INSTALL_DIR}/lib/php/extensions/* /tmp/layer/lib/php/extensions/
9191
RUN cp ${INSTALL_DIR}/etc/php/conf.d/* /tmp/layer/ymir/etc/php/conf.d/
92-
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/ymir/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/ymir/lib/ || true && \
93-
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/ymir/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/ymir/lib/
92+
RUN cp ${INSTALL_DIR}/lib/libsqlite3.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libssl.so.1.1 /tmp/layer/lib/ || true && cp ${INSTALL_DIR}/lib/libcrypto.so.1.1 /tmp/layer/lib/ || true && \
93+
cp ${INSTALL_DIR}/lib/libMagickWand-7.Q16HDRI.so* /tmp/layer/lib/ && cp ${INSTALL_DIR}/lib/libMagickCore-7.Q16HDRI.so* /tmp/layer/lib/
9494
COPY shared/copy-dependencies.php /tmp/copy-dependencies.php
95-
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/ymir/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/lib/php/extensions /tmp/layer/ymir/lib
96-
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/ymir/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
95+
RUN ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/ymir/bin /tmp/layer/lib && ${INSTALL_DIR}/bin/php /tmp/copy-dependencies.php /tmp/layer/lib/php/extensions /tmp/layer/lib
96+
RUN find /tmp/layer/ymir/bin -type f -exec strip --strip-all {} + || true && find /tmp/layer/lib -type f -name "*.so*" -exec strip --strip-unneeded {} + || true
9797
COPY shared/php.ini /tmp/layer/ymir/etc/php/php.ini
9898
COPY shared/php-fpm.conf /tmp/layer/ymir/etc/php-fpm.d/php-fpm.conf
9999

100100
FROM --platform=${DOCKER_PLATFORM} public.ecr.aws/lambda/provided:al2023-${CPU_ARCHITECTURE}
101-
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/ymir/lib"
102-
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/vendor /opt/
101+
ENV PATH="/opt/bin:${PATH}" LD_LIBRARY_PATH="/opt/lib"
102+
COPY --from=build-environment /opt/bootstrap /opt/runtime.php /opt/composer.json /opt/composer.lock /opt/src /opt/templates /opt/
103+
COPY --from=build-environment /opt/vendor /opt/vendor
103104
COPY --from=build-environment /tmp/layer /opt

0 commit comments

Comments
 (0)