Skip to content

Commit 7c9fbc1

Browse files
committed
Add support for compose CLI
1 parent e4a37d3 commit 7c9fbc1

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

Dockerfile

+11-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ ARG DOCKER_VERSION=20.10.6
55
ARG DOCKER_BUILDX_VERSION=0.5.1
66
ARG DOCKER_APP_VERSION=0.9.1-beta3
77
ARG DOCKER_SCAN_VERSION=0.8.0
8+
ARG COMPOSE_CLI_VERSION=1.0.16
89

9-
RUN mkdir -p /dist/usr/bin
1010
RUN mkdir -p /dist/home/node/.docker/cli-plugins
1111
RUN mkdir /dist/app
1212

1313
WORKDIR /work
1414

1515
# Install docker CLI
16+
RUN mkdir -p /dist/usr/bin
1617
RUN wget -qc -O docker.tgz "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz"
1718
RUN tar -xzf docker.tgz
1819
RUN mv docker/docker /dist/usr/bin/
@@ -28,11 +29,19 @@ RUN tar xzf docker-app-linux.tar.gz
2829
RUN mv docker-app-plugin-linux /dist/home/node/.docker/cli-plugins/docker-app
2930

3031
# Install "docker scan" plugin
31-
#RUN wget https://github.com/docker/scan-cli-plugin/releases/download/latest/docker-scan_linux_amd64
3232
RUN wget https://github.com/docker/scan-cli-plugin/releases/download/v${DOCKER_SCAN_VERSION}/docker-scan_linux_amd64
3333
RUN chmod +x docker-scan_linux_amd64
3434
RUN mv docker-scan_linux_amd64 /dist/home/node/.docker/cli-plugins/docker-scan
3535

36+
# Install compose
37+
RUN wget https://github.com/docker/compose-cli/releases/download/v${COMPOSE_CLI_VERSION}/docker-linux-amd64.tar.gz
38+
RUN tar xzf docker-linux-amd64.tar.gz
39+
RUN mkdir -p /dist/usr/local/bin
40+
RUN install -m 775 docker/docker /dist/usr/local/bin/docker
41+
RUN ln -s /usr/bin/docker /dist/usr/local/bin/com.docker.cli
42+
RUN mv docker/docker-compose /dist/home/node/.docker/cli-plugins/docker-compose
43+
44+
3645
COPY package.json .
3746
COPY yarn.lock .
3847
RUN yarn install

README.md

+13
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,19 @@ drrmitep sh image # docker run --rm -it --entrypoint sh image
6262
drrmep id image # docker run --rm --entrypoint id image
6363
dexit container sh # docker exec -it container sh
6464
drmf container # docker rm -f container
65+
66+
#See https://github.com/docker/compose-cli/blob/main/INSTALL.md
67+
dco # docker compose
68+
dcoup # docker compose up
69+
dcoupd # docker compose up -d
70+
dcob # docker compose build
71+
dcod # docker compose down
72+
dcodv # docker compose down -v
73+
dcolg # docker compose logs
74+
dcolg # docker compose logs
75+
dcol # docker compose pull
76+
dcoex service command # docker compose logs service command
77+
dcof file up # docker compose -f file up
6578
```
6679

6780
### Parameters in aliases

createAliases.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ let predefinedAbbrevCmds = {
3535
br: 'builder',
3636
bx: 'buildx',
3737
c: 'container',
38-
cm: 'commit',
3938
cf: 'config',
39+
cm: 'commit',
40+
co: 'compose',
4041
cx: 'context',
4142
ex: 'exec',
4243
img: 'image',
@@ -49,10 +50,10 @@ let predefinedAbbrevCmds = {
4950
r: 'run',
5051
s: 'swarm',
5152
se: 'search',
52-
svc: 'service',
5353
st: 'stack',
54-
t: 'tag',
5554
sta: 'start',
55+
svc: 'service',
56+
t: 'tag',
5657
};
5758
const predefinedAbbrevCmdsByCommand = swapKeyValue(predefinedAbbrevCmds);
5859

0 commit comments

Comments
 (0)