diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5448187..75322f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+### Changed
+- Downgrade Docker Compose from [1.29.2](https://github.com/docker/compose/releases/tag/1.29.2) to [1.28.0](https://github.com/docker/compose/releases/tag/1.28.0) for Alpine image, to get faster builds 🚀
+- Reduce Docker images size based on Alpine, again
+
## [1.2.0-beta.1] - 2021-09-03
### Added
@@ -12,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Test PSU with Portainer CE [2.6.3](https://app.swaggerhub.com/apis/deviantony/Portainer/2.0.1) API
### Changed
-- Use Docker [Compose 1.29.3](https://github.com/docker/compose/releases/tag/1.29.2) instead of Docker [Compose 1.28.3](https://github.com/docker/compose/releases/tag/1.28.3)
+- Use Docker [Compose 1.29.2](https://github.com/docker/compose/releases/tag/1.29.2) instead of Docker [Compose 1.28.3](https://github.com/docker/compose/releases/tag/1.28.3)
- Upgrade Operating System of Docker based images, with [Alpine 3.14](https://hub.docker.com/_/alpine) and [Debian 11](https://hub.docker.com/_/debian)
- Reduce Docker images size
- Use [Traefik 2.5](https://doc.traefik.io/traefik/v2.5) instead of [Traefik 2.4](https://doc.traefik.io/traefik/v2.4) for testing
diff --git a/Dockerfile b/Dockerfile
index 1c5c8bb..609d38a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,8 @@
FROM alpine:3.14
-ARG DOCKER_COMPOSE_VERSION_GTE=1.29.2
-ARG DOCKER_COMPOSE_VERSION_LT=1.30.0
-
RUN set -e; \
apk add --no-cache \
- bash ca-certificates gettext jq \
- py3-pip python3-dev libc-dev libffi-dev openssl-dev gcc make musl-dev py3-wheel; \
- \
- pip3 --no-cache-dir install "docker-compose>=${DOCKER_COMPOSE_VERSION_GTE},<${DOCKER_COMPOSE_VERSION_LT}" "httpie>=1.0.3,<1.1.0" "cryptography>=3.3.2,<3.4.0"; \
- \
- apk del python3-dev libc-dev libffi-dev openssl-dev gcc make musl-dev py3-wheel; \
+ bash ca-certificates docker-compose gettext httpie jq; \
rm -rf $(find / -regex '.*\.py[co]')
ENV LANG="en_US.UTF-8" \
diff --git a/Dockerfile.core b/Dockerfile.core
index ed621d1..ca61667 100644
--- a/Dockerfile.core
+++ b/Dockerfile.core
@@ -2,8 +2,7 @@ FROM alpine:3.14
RUN set -e; \
apk add --no-cache \
- bash ca-certificates gettext jq py3-pip; \
- pip3 --no-cache-dir install httpie; \
+ bash ca-certificates gettext httpie jq py3-setuptools; \
rm -rf $(find / -regex '.*\.py[co]')
ENV LANG="en_US.UTF-8" \