Skip to content

Commit

Permalink
chore: remove useless EDANT_WATCHER_VERSION Docker ARG
Browse files Browse the repository at this point in the history
  • Loading branch information
dunglas committed Nov 27, 2024
1 parent fd49ead commit 8a199bb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
3 changes: 1 addition & 2 deletions dev-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
php --version

# Install e-dant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher . && \
RUN git clone https://github.com/e-dant/watcher . && \
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release && \
cmake --build build/ && \
cmake --install build
Expand Down
3 changes: 1 addition & 2 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ RUN git clone --branch=PHP-8.4 https://github.com/php/php-src.git . && \
php --version

# Install e-dant/watcher (necessary for file watching)
ARG EDANT_WATCHER_VERSION=release
WORKDIR /usr/local/src/watcher
RUN git clone --branch=$EDANT_WATCHER_VERSION https://github.com/e-dant/watcher . && \
RUN git clone https://github.com/e-dant/watcher . && \
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release && \
cmake --build build/ && \
cmake --install build
Expand Down
6 changes: 0 additions & 6 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ variable "GO_VERSION" {
default = "1.23"
}

variable EDANT_WATCHER_VERSION {
default = "next"
}

variable "SHA" {}

variable "LATEST" {
Expand Down Expand Up @@ -119,7 +115,6 @@ target "default" {
}
args = {
FRANKENPHP_VERSION = VERSION
EDANT_WATCHER_VERSION = EDANT_WATCHER_VERSION
}
}

Expand All @@ -145,7 +140,6 @@ target "static-builder" {
}
args = {
FRANKENPHP_VERSION = VERSION
EDANT_WATCHER_VERSION = EDANT_WATCHER_VERSION
}
secret = ["id=github-token,env=GITHUB_TOKEN"]
}

0 comments on commit 8a199bb

Please sign in to comment.