Skip to content

Commit

Permalink
Merge pull request #4783 from coollabsio/dep-bump
Browse files Browse the repository at this point in the history
Dependencie upgrade
  • Loading branch information
peaklabs-dev authored Jan 9, 2025
2 parents 1fe4dd7 + 8921a8a commit 05873d1
Show file tree
Hide file tree
Showing 11 changed files with 253 additions and 227 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,22 @@
"symfony/yaml": "^7.1.6",
"visus/cuid2": "^4.1.0",
"yosymfony/toml": "^1.0",
"zircote/swagger-php": "^4.10"
"zircote/swagger-php": "^5.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.13",
"driftingly/rector-laravel": "^1.2",
"driftingly/rector-laravel": "^2.0",
"fakerphp/faker": "^1.21.0",
"laravel/dusk": "^8.0",
"laravel/pint": "^1.16",
"laravel/telescope": "^5.2",
"mockery/mockery": "^1.5.1",
"nunomaduro/collision": "^8.1",
"pestphp/pest": "^3.5",
"phpstan/phpstan": "^1.12.10",
"phpunit/phpunit": "^11.4",
"rector/rector": "^1.2",
"serversideup/spin": "^2.3",
"phpstan/phpstan": "^2.1",
"phpunit/phpunit": "^11.5",
"rector/rector": "^2.0",
"serversideup/spin": "^3.0",
"spatie/laravel-ignition": "^2.1.0",
"symfony/http-client": "^7.1"
},
Expand Down
109 changes: 57 additions & 52 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions docker/coolify-helper/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Versions

# https://hub.docker.com/_/alpine
ARG BASE_IMAGE=alpine:3.20
ARG BASE_IMAGE=alpine:3.21
# https://download.docker.com/linux/static/stable/
ARG DOCKER_VERSION=27.3.1
ARG DOCKER_VERSION=27.4.1
# https://github.com/docker/compose/releases
ARG DOCKER_COMPOSE_VERSION=2.30.3
ARG DOCKER_COMPOSE_VERSION=2.32.2
# https://github.com/docker/buildx/releases
ARG DOCKER_BUILDX_VERSION=0.18.0
ARG DOCKER_BUILDX_VERSION=0.19.3
# https://github.com/buildpacks/pack/releases
ARG PACK_VERSION=0.35.1
ARG PACK_VERSION=0.36.2
# https://github.com/railwayapp/nixpacks/releases
ARG NIXPACKS_VERSION=1.29.0
# https://hub.docker.com/r/minio/mc/tags
ARG MINIO_VERSION=RELEASE.2024-03-07T00-31-49Z
ARG NIXPACKS_VERSION=1.30.0
# https://github.com/minio/mc/releases
ARG MINIO_VERSION=RELEASE.2024-11-21T17-21-54Z

FROM minio/mc:${MINIO_VERSION} AS minio-client

Expand Down
26 changes: 14 additions & 12 deletions docker/coolify-realtime/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
FROM quay.io/soketi/soketi:1.6-16-alpine
# Versions
# https://github.com/soketi/soketi/releases
ARG SOKETI_VERSION=1.6-16-alpine
# https://github.com/cloudflare/cloudflared/releases
ARG CLOUDFLARED_VERSION=2025.1.0

FROM quay.io/soketi/soketi:${SOKETI_VERSION}

ARG TARGETPLATFORM
# https://github.com/cloudflare/cloudflared/releases
ARG CLOUDFLARED_VERSION=2024.4.1
ARG CLOUDFLARED_VERSION

WORKDIR /terminal
RUN apk add --no-cache openssh-client make g++ python3 curl
Expand All @@ -13,14 +17,12 @@ RUN npm rebuild node-pty --update-binary
COPY docker/coolify-realtime/soketi-entrypoint.sh /soketi-entrypoint.sh
COPY docker/coolify-realtime/terminal-server.js /terminal/terminal-server.js

RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
echo 'amd64' && \
curl -sSL https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
;fi"

RUN /bin/sh -c "if [[ ${TARGETPLATFORM} == 'linux/arm64' ]]; then \
echo 'arm64' && \
curl -L https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64 -o /usr/local/bin/cloudflared && chmod +x /usr/local/bin/cloudflared \
;fi"
# Install Cloudflared based on architecture
RUN if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then \
curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-amd64" -o /usr/local/bin/cloudflared; \
elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
curl -sSL "https://github.com/cloudflare/cloudflared/releases/download/${CLOUDFLARED_VERSION}/cloudflared-linux-arm64" -o /usr/local/bin/cloudflared; \
fi && \
chmod +x /usr/local/bin/cloudflared

ENTRYPOINT ["/bin/sh", "/soketi-entrypoint.sh"]
Loading

0 comments on commit 05873d1

Please sign in to comment.