Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker build -t frankenphp-dev -f dev.Dockerfile .
docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 8080:8080 -p 443:443 -p 443:443/udp -v $PWD:/go/src/app -it frankenphp-dev
```

The image contains the usual development tools (Go, GDB, Valgrind, Neovim...) and uses the following php setting locations
The image contains the usual development tools (Go, GDB, Valgrind...) and uses the following php setting locations

- php.ini: `/etc/frankenphp/php.ini` A php.ini file with development presets is provided by default.
- additional configuration files: `/etc/frankenphp/php.d/*.ini`
Expand Down
8 changes: 5 additions & 3 deletions dev-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,13 @@ RUN apk add --no-cache \
libstdc++ \
linux-headers \
# Dev tools \
bash \
git \
clang \
cmake \
llvm \
gdb \
valgrind \
neovim \
zsh \
libtool && \
echo 'set auto-load safe-path /' > /root/.gdbinit

Expand Down Expand Up @@ -78,8 +77,11 @@ RUN git clone https://github.com/e-dant/watcher . && \
WORKDIR /go/src/app
COPY . .

# Cache test dependencies too, so tests run offline
RUN go mod download && go -C caddy mod download

WORKDIR /go/src/app/caddy/frankenphp
RUN ../../go.sh build -buildvcs=false

WORKDIR /go/src/app
CMD [ "zsh" ]
CMD [ "bash" ]
7 changes: 4 additions & 3 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ RUN apt-get update && \
llvm \
gdb \
valgrind \
neovim \
zsh \
libtool-bin && \
echo 'set auto-load safe-path /' > /root/.gdbinit && \
echo '* soft core unlimited' >> /etc/security/limits.conf \
Expand Down Expand Up @@ -82,8 +80,11 @@ RUN git clone https://github.com/e-dant/watcher . && \
WORKDIR /go/src/app
COPY --link . ./

# Cache test dependencies too, so tests run offline
RUN go mod download && go -C caddy mod download

WORKDIR /go/src/app/caddy/frankenphp
RUN ../../go.sh build -buildvcs=false

WORKDIR /go/src/app
CMD [ "zsh" ]
CMD [ "bash" ]
Loading