@@ -77,31 +77,24 @@ jobs:
77
77
set -eu
78
78
# Install Docker (Ubuntu official repo for Docker CE; Amazon Linux fallback)
79
79
if command -v apt-get >/dev/null 2>&1; then
80
+ # Ubuntu path (no gpg; use .asc key file)
80
81
export DEBIAN_FRONTEND=noninteractive
81
82
apt-get update -y
82
- for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do
83
- apt-get remove -y "$pkg" || true
84
- done
85
- apt-get install -y ca-certificates curl gnupg unzip
83
+ # remove conflicting Ubuntu docker bits (safe if absent)
84
+ apt-get remove -y docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc || true
85
+ apt-get install -y ca-certificates curl unzip
86
86
install -m 0755 -d /etc/apt/keyrings
87
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor - o /etc/apt/keyrings/docker.gpg
88
- chmod a+r /etc/apt/keyrings/docker.gpg
87
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg - o /etc/apt/keyrings/docker.asc
88
+ chmod a+r /etc/apt/keyrings/docker.asc
89
89
. /etc/os-release
90
- echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $VERSION_CODENAME stable" > /etc/apt/sources.list.d/docker.list
90
+ echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $VERSION_CODENAME stable" > /etc/apt/sources.list.d/docker.list
91
+
91
92
apt-get update -y
92
93
apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
93
- elif command -v dnf >/dev/null 2>&1; then
94
- dnf -y update || true
95
- dnf -y install docker curl unzip || yum -y install docker curl unzip
96
- elif command -v yum >/dev/null 2>&1; then
97
- yum -y update || true
98
- yum -y install docker curl unzip
99
- else
100
- echo "no supported package manager found"; exit 1
101
- fi
102
- systemctl enable --now docker || true
103
-
104
- # ECR login, pull latest, run on 80->8080
94
+ systemctl enable --now docker || true
95
+
96
+
97
+ # ECR login, pull latest, run on 80->8080
105
98
ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
106
99
REGION='${AWS_REGION}'
107
100
REGISTRY="${ACCOUNT_ID}.dkr.ecr.${REGION}.amazonaws.com"
0 commit comments