Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update references to docker/compose-{cli => ecs} #1

Merged
merged 1 commit into from
Nov 8, 2023
+9 −8
Merged

Update references to docker/compose-{cli => ecs} #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin/
dist/
/.idea/
/.vscode/
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ARG GOLANGCI_LINT_VERSION=v1.50.1-alpine
ARG PROTOC_GEN_GO_VERSION=v1.5.2

FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
WORKDIR /compose-cli
WORKDIR /compose-ecs
RUN apk add --no-cache -vv \
git \
docker \
Expand Down Expand Up @@ -88,7 +88,7 @@ RUN --mount=target=. \
make BINARY=/out/docker -f builder.Makefile cross

FROM scratch AS protos
COPY --from=make-protos --link /compose-cli/cli/server/protos .
COPY --from=make-protos --link /compose-ecs/cli/server/protos .

FROM scratch AS cli
COPY --from=make-cli --link /out/* .
Expand Down Expand Up @@ -119,8 +119,8 @@ RUN --mount=type=cache,target=/go/pkg/mod \
go mod tidy

FROM scratch AS go-mod-tidy
COPY --from=make-go-mod-tidy --link /compose-cli/go.mod .
COPY --from=make-go-mod-tidy --link /compose-cli/go.sum .
COPY --from=make-go-mod-tidy --link /compose-ecs/go.mod .
COPY --from=make-go-mod-tidy --link /compose-ecs/go.sum .

FROM base AS check-go-mod
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ with a fresh install of Ubuntu 20.04.
You can install the Compose CLI using the install script:

```console
curl -L https://raw.githubusercontent.com/docker/compose-cli/main/scripts/install/install_linux.sh | sh
curl -L https://raw.githubusercontent.com/docker/compose-ecs/main/scripts/install/install_linux.sh | sh
```

## Manual install
Expand Down Expand Up @@ -103,4 +103,4 @@ To test the install script, from a machine with docker:

```console
docker build -t testclilinux -f scripts/Dockerfile-testInstall scripts
```
```
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Docker maintainers file
#
# This file describes who runs the docker/compose-cli project and how.
# This file describes who runs the docker/compose-ecs project and how.
# This is a living document - if you see something out of date or missing, speak up!
#
# It is structured to be consumable by both humans and programs.
Expand Down
2 changes: 1 addition & 1 deletion scripts/install/install_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

set -eu

RELEASE_URL=https://api.github.com/repos/docker/compose-cli/releases/latest
RELEASE_URL=https://api.github.com/repos/docker/compose-ecs/releases/latest
LINK_NAME="${LINK_NAME:-com.docker.cli}"
DRY_RUN="${DRY_RUN:-}"

Expand Down