Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe3719530a | ||
|
|
603f497bef |
@@ -3,9 +3,10 @@ FROM ${BASE_IMAGE}
|
|||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends bash ca-certificates curl docker.io docker-compose; \
|
apt-get install -y --no-install-recommends bash ca-certificates curl docker.io docker-compose libcurl4-openssl-dev libsqlite3-dev; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite; \
|
||||||
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'
|
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'; \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY auto-updater.php /usr/local/bin/auto-updater.php
|
COPY auto-updater.php /usr/local/bin/auto-updater.php
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,11 @@ ARG BASE_IMAGE=php:8.2-cli-bookworm
|
|||||||
FROM ${BASE_IMAGE}
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'
|
apt-get update; \
|
||||||
|
apt-get install -y --no-install-recommends libcurl4-openssl-dev libsqlite3-dev; \
|
||||||
|
docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite; \
|
||||||
|
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'; \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /opt/truckwash-edge-agent
|
WORKDIR /opt/truckwash-edge-agent
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,11 @@ ARG BASE_IMAGE=php:8.2-cli-bookworm
|
|||||||
FROM ${BASE_IMAGE}
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'
|
apt-get update; \
|
||||||
|
apt-get install -y --no-install-recommends libcurl4-openssl-dev libsqlite3-dev; \
|
||||||
|
docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite; \
|
||||||
|
php -r 'foreach (["curl", "sqlite3"] as $extension) { if (!extension_loaded($extension)) { fwrite(STDERR, "Missing PHP extension: {$extension}\n"); exit(1); } }'; \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /opt/truckwash-edge-agent
|
WORKDIR /opt/truckwash-edge-agent
|
||||||
|
|
||||||
|
|||||||
@@ -97,16 +97,21 @@ it('builds the installer around the compose stack artifacts and management polli
|
|||||||
expect($agentSource)->toContain("'last_transport_error'");
|
expect($agentSource)->toContain("'last_transport_error'");
|
||||||
expect($agentSource)->toContain('private function recordTransportFailure(string $context, Throwable $throwable): void');
|
expect($agentSource)->toContain('private function recordTransportFailure(string $context, Throwable $throwable): void');
|
||||||
expect($edgeDockerfileSource)->toContain('FROM ${BASE_IMAGE}');
|
expect($edgeDockerfileSource)->toContain('FROM ${BASE_IMAGE}');
|
||||||
|
expect($edgeDockerfileSource)->toContain('apt-get install -y --no-install-recommends libcurl4-openssl-dev libsqlite3-dev;');
|
||||||
|
expect($edgeDockerfileSource)->toContain('docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite;');
|
||||||
expect($edgeDockerfileSource)->toContain('extension_loaded($extension)');
|
expect($edgeDockerfileSource)->toContain('extension_loaded($extension)');
|
||||||
expect($edgeDockerfileSource)->toContain('Missing PHP extension: {$extension}');
|
expect($edgeDockerfileSource)->toContain('Missing PHP extension: {$extension}');
|
||||||
expect($edgeDockerfileSource)->toContain('COPY agent.php /opt/truckwash-edge-agent/agent.php');
|
expect($edgeDockerfileSource)->toContain('COPY agent.php /opt/truckwash-edge-agent/agent.php');
|
||||||
expect($workerDockerfileSource)->toContain('FROM ${BASE_IMAGE}');
|
expect($workerDockerfileSource)->toContain('FROM ${BASE_IMAGE}');
|
||||||
|
expect($workerDockerfileSource)->toContain('apt-get install -y --no-install-recommends libcurl4-openssl-dev libsqlite3-dev;');
|
||||||
|
expect($workerDockerfileSource)->toContain('docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite;');
|
||||||
expect($workerDockerfileSource)->toContain('extension_loaded($extension)');
|
expect($workerDockerfileSource)->toContain('extension_loaded($extension)');
|
||||||
expect($workerDockerfileSource)->toContain('Missing PHP extension: {$extension}');
|
expect($workerDockerfileSource)->toContain('Missing PHP extension: {$extension}');
|
||||||
expect($workerDockerfileSource)->toContain('COPY lan-worker.php /opt/truckwash-edge-agent/lan-worker.php');
|
expect($workerDockerfileSource)->toContain('COPY lan-worker.php /opt/truckwash-edge-agent/lan-worker.php');
|
||||||
expect($autoUpdaterSource)->toContain("'/bin/bash ' . escapeshellarg(\$launcherPath) . ' reconcile 2>&1'");
|
expect($autoUpdaterSource)->toContain("'/bin/bash ' . escapeshellarg(\$launcherPath) . ' reconcile 2>&1'");
|
||||||
expect($autoUpdaterDockerfileSource)->toContain('COPY auto-updater.php /usr/local/bin/auto-updater.php');
|
expect($autoUpdaterDockerfileSource)->toContain('COPY auto-updater.php /usr/local/bin/auto-updater.php');
|
||||||
expect($autoUpdaterDockerfileSource)->toContain('apt-get install -y --no-install-recommends bash ca-certificates curl docker.io docker-compose;');
|
expect($autoUpdaterDockerfileSource)->toContain('apt-get install -y --no-install-recommends bash ca-certificates curl docker.io docker-compose libcurl4-openssl-dev libsqlite3-dev;');
|
||||||
|
expect($autoUpdaterDockerfileSource)->toContain('docker-php-ext-install -j"$(nproc)" curl sqlite3 pdo_sqlite;');
|
||||||
expect($autoUpdaterDockerfileSource)->toContain('extension_loaded($extension)');
|
expect($autoUpdaterDockerfileSource)->toContain('extension_loaded($extension)');
|
||||||
expect($serviceSource)->not->toContain('node /opt/truckwash-edge-agent/agent.mjs');
|
expect($serviceSource)->not->toContain('node /opt/truckwash-edge-agent/agent.mjs');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user