Skip to content

Upgraded Dockerfile, specified build platform #1

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

Open
alex-astafyev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgraded Dockerfile, specified build platform #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
12 changes: 4 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM docker:20.10.6

ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
FROM docker:26.1.0

RUN apk update \
&& apk add --no-cache \
aws-cli \
bash \
curl \
docker-compose \
gcc \
git \
jq \
Expand All @@ -16,15 +16,11 @@ RUN apk update \
make \
openssh \
openssl-dev \
py3-pip \
python3-dev \
groff

RUN pip3 install awscli docker-compose

ARG ECS_HELPER_VERSION

RUN gem install ecs_helper $ECS_HELPER_VERSION

RUN mkdir /app
WORKDIR /app
WORKDIR /app
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ check_version:
$(call check_variable,VERSION)

build:
docker build --build-arg ECS_HELPER_VERSION="-v ${VERSION}" . -t ${VERSION_TAG} -t ${LATEST_TAG}
docker build --platform linux/amd64 --build-arg ECS_HELPER_VERSION="-v ${VERSION}" . -t ${VERSION_TAG} -t ${LATEST_TAG}

push:
docker push ${VERSION_TAG}
docker push ${LATEST_TAG}

release: check_version build push

.SILENT: check_version
.SILENT: check_version
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
build:
context: .
args:
- ECS_HELPER_VERSION=-v 0.0.24
- ECS_HELPER_VERSION=-v 0.0.37
environment: *toolbox-environment
volumes:
- .:/app:cached
Expand Down