Skip to content
This repository was archived by the owner on May 21, 2025. It is now read-only.

Remove blackfire #83

Merged
timkelty merged 5 commits into from
Sep 3, 2023
Merged

Remove blackfire #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9dd5ee
docs: fix typo
jawys Aug 28, 2023
a20927c
build: remove blackfire from Dockerfiles
jawys Aug 28, 2023
7d78389
build: remove unneeded RUNs due to buildkit logic
jawys Aug 28, 2023
e72ee38
chore: rm */blackfire*
jawys Aug 28, 2023
a24c42e
build: fix typo in Makefile
jawys Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions 8.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,8 @@ RUN RUNTIME_DEPS="$(scanelf --needed --nobanner --recursive /usr/local \
# copy custom.ini settings
COPY craft-cms.ini /usr/local/etc/php/conf.d/

# copy the blackfire script
COPY blackfire-install.sh /tmp/blackfire-install.sh

# run the installation script
RUN set -ex && sh /tmp/blackfire-install.sh && rm -rf /tmp/blackfire*

# make the directories and set permissions
RUN mkdir -p /app

# set the permissions on the
RUN chown -R www-data:www-data /app

Comment thread
timkelty marked this conversation as resolved.
# set the working directory for conveinence
WORKDIR /app

# run container as the www-data user
USER www-data
Comment thread
timkelty marked this conversation as resolved.

# set the working directory for convenience
WORKDIR /app
34 changes: 0 additions & 34 deletions 8.0/blackfire-install.sh
View file
Open in desktop

This file was deleted.

16 changes: 2 additions & 14 deletions 8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,8 @@ RUN RUNTIME_DEPS="$(scanelf --needed --nobanner --recursive /usr/local \
# copy custom.ini settings
COPY craft-cms.ini /usr/local/etc/php/conf.d/

# copy the blackfire script
COPY blackfire-install.sh /tmp/blackfire-install.sh

# run the installation script
RUN set -ex && sh /tmp/blackfire-install.sh && rm -rf /tmp/blackfire*

# make the directories and set permissions
RUN mkdir -p /app

# set the permissions on the
RUN chown -R www-data:www-data /app
# run container as the www-data user
USER www-data

# set the working directory for convenience
WORKDIR /app

# run container as the www-data user
USER www-data
34 changes: 0 additions & 34 deletions 8.1/blackfire-install.sh
View file
Open in desktop

This file was deleted.

16 changes: 2 additions & 14 deletions 8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,20 +125,8 @@ RUN RUNTIME_DEPS="$(scanelf --needed --nobanner --recursive /usr/local \
# copy custom.ini settings
COPY craft-cms.ini /usr/local/etc/php/conf.d/

# copy the blackfire script
COPY blackfire-install.sh /tmp/blackfire-install.sh

# run the installation script
RUN set -ex && sh /tmp/blackfire-install.sh && rm -rf /tmp/blackfire*

# make the directories and set permissions
RUN mkdir -p /app

# set the permissions on the
RUN chown -R www-data:www-data /app
# run container as the www-data user
USER www-data

# set the working directory for convenience
WORKDIR /app

# run container as the www-data user
USER www-data
34 changes: 0 additions & 34 deletions 8.2/blackfire-install.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ all-cli:
--build-arg PROJECT_TYPE=cli \
-t craftcms/cli:8.2 8.2
docker buildx build --load --platform linux/amd64 --builder all-platforms \
--build-arg PHP_VERSION=8.2 \
--build-arg PHP_VERSION=8.1 \
--build-arg PROJECT_TYPE=cli \
-t craftcms/cli:8.1 8.1
docker buildx build --load --platform linux/amd64 --builder all-platforms \
Expand Down