Compare commits

...

2 Commits

Author SHA1 Message Date
80e885e85d Update to 1.3.5 2023-12-17 06:21:24 +08:00
e54ede3f1c Revert "Update Docker Dompose plugin to 2.23.3" (#307) 2023-12-17 06:14:15 +08:00
4 changed files with 8 additions and 56 deletions

View File

@ -2,14 +2,6 @@
FROM node:18.17.1-bookworm-slim FROM node:18.17.1-bookworm-slim
ENV PNPM_HOME="/pnpm" ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH" ENV PATH="$PNPM_HOME:$PATH"
# TARGETPLATFORM: linux/amd64, linux/arm64, linux/arm/v7
ARG TARGETPLATFORM
# TARGETARCH: amd64, arm64, arm/v7
ARG TARGETARCH
RUN apt update && apt install --yes --no-install-recommends \ RUN apt update && apt install --yes --no-install-recommends \
curl \ curl \
ca-certificates \ ca-certificates \
@ -26,12 +18,7 @@ RUN apt update && apt install --yes --no-install-recommends \
&& apt update \ && apt update \
&& apt --yes --no-install-recommends install \ && apt --yes --no-install-recommends install \
docker-ce-cli \ docker-ce-cli \
docker-compose-plugin \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& npm install pnpm -g \ && npm install pnpm -g \
&& pnpm install -g tsx && pnpm install -g tsx
# Download docker-compose, as the repo's docker-compose is not up-to-date.
COPY ./extra/download-docker-compose.ts ./extra/download-docker-compose.ts
ARG DOCKER_COMPOSE_VERSION="2.23.3"
RUN tsx ./extra/download-docker-compose.ts ${TARGETPLATFORM} ${DOCKER_COMPOSE_VERSION} \
&& docker compose version

View File

@ -1,39 +0,0 @@
import fs from "fs";
async function main() {
// TARGETPLATFORM
const targetPlatform = process.argv[2];
// Docker Compose version
const dockerComposeVersion = process.argv[3];
// Arch
let arch = "";
if (targetPlatform === "linux/amd64") {
arch = "x86_64";
} else if (targetPlatform === "linux/arm64") {
arch = "aarch64";
} else if (targetPlatform === "linux/arm/v7") {
arch = "armv7";
} else {
throw new Error(`Unknown target platform: ${targetPlatform}`);
}
// mkdir -p /root/.docker/cli-plugins
fs.mkdirSync("/root/.docker/cli-plugins", { recursive: true });
// Download URL
const url = `https://github.com/docker/compose/releases/download/v${dockerComposeVersion}/docker-compose-linux-${arch}`;
console.log(url);
// Download docker-compose using fetch api, to "/root/.docker/cli-plugins/docker-compose"
const buffer = await (await fetch(url)).arrayBuffer();
fs.writeFileSync("/root/.docker/cli-plugins/docker-compose", Buffer.from(buffer));
// chmod +x /root/.docker/cli-plugins/docker-compose
fs.chmodSync("/root/.docker/cli-plugins/docker-compose", 0o111);
}
main();

View File

@ -1,6 +1,10 @@
// Generate on GitHub // Generate on GitHub
const input = ` const input = `
* Add Korean translation by @Alanimdeo in https://github.com/louislam/dockge/pull/86 * Fixed envsubst issue by @louislam in https://github.com/louislam/dockge/pull/301
* Fix: Only adding folders to stack with a compose file. by @Ozy-Viking in https://github.com/louislam/dockge/pull/299
* Terminal text cols adjusts to terminal container. by @Ozy-Viking in https://github.com/louislam/dockge/pull/285
* Update Docker Dompose plugin to 2.23.3 by @louislam in https://github.com/louislam/dockge/pull/303
* Translations update from Kuma Weblate by @UptimeKumaBot in https://github.com/louislam/dockge/pull/302
`; `;
const template = ` const template = `

View File

@ -1,6 +1,6 @@
{ {
"name": "dockge", "name": "dockge",
"version": "1.3.4", "version": "1.3.5",
"type": "module", "type": "module",
"engines": { "engines": {
"node": ">= 18.0.0 && <= 18.17.1" "node": ">= 18.0.0 && <= 18.17.1"