diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3f09aa..45c3ffe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,6 @@ migrate: script: - docker pull "$CI_REGISTRY_IMAGE":"$DEBIAN_VERSION"-migrated || true - docker build --build-arg DEBIAN_VERSION="$DEBIAN_VERSION" - -t "$CI_REGISTRY_IMAGE":"$DEBIAN_VERSION"-migrated - - < migrate.df + --tag "$CI_REGISTRY_IMAGE":"$DEBIAN_VERSION"-migrated + --file migrate.df . - docker push "$CI_REGISTRY_IMAGE":"$DEBIAN_VERSION"-migrated diff --git a/migrate.df b/migrate.df index 31141cd..742b3cf 100644 --- a/migrate.df +++ b/migrate.df @@ -7,14 +7,14 @@ ARG DEBIAN_VERSION FROM debian:${DEBIAN_VERSION} LABEL maintainer="Olaf Meeuwissen " +COPY ./repository@devuan.org.asc /tmp/ + RUN url=http://auto.mirror.devuan.org/merged \ && echo "deb $url jessie main" > /etc/apt/sources.list \ && echo "deb $url jessie-updates main" >> /etc/apt/sources.list \ && echo "deb $url jessie-security main" >> /etc/apt/sources.list \ && (rm /etc/apt/sources.list.d/* || true) \ - && apt-key adv \ - --keyserver hkp://p80.pool.sks-keyservers.net:80 \ - --recv-keys 72E3CB773315DFA2E464743D94532124541922FB \ + && apt-key add /tmp/repository@devuan.org.asc \ && apt-get update -q \ && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -q -y \ && DEBIAN_FRONTEND=noninteractive apt-get --purge autoremove -q -y \ diff --git a/repository@devuan.org.asc b/repository@devuan.org.asc new file mode 100644 index 0000000..2f4b3cc --- /dev/null +++ b/repository@devuan.org.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFR97tIBCACZlyH1mNS0KAzJkWYCkfhodP6U/yHufchhCTBCysnlrIfrROXm +ZDzSqgObpaQa+rGnTfJ8UvCkTVxRlYQY7yjIQhCGZ+aFVwwNMPNGd74tjj2yy7tG ++yzXtHhYfXr9YJzDfzUuZMhO11W/g0ljSCjCLQUo7ubj0mASCdkDT8BcTDAmKi0V +O9QUePbWgJ/pgW++7ez6k55wYZpz5Ibh++8R/dqPeOhnd6w/qE71FaGfy6uAKxqR +tlProzxBKSknt6m0AupPqRGg8AYgUU8VaUkQGIMNN/bf7we1ci0JuxvH9Gz2Puqq +R73znqWQJHn1g0qqIh05N51kZZz3w3XE+9r9ABEBAAG0RkRldnVhbiBSZXBvc2l0 +b3J5IChQcmltYXJ5IERldnVhbiBzaWduaW5nIGtleSkgPHJlcG9zaXRvcnlAZGV2 +dWFuLm9yZz6JATgEEwECACIFAlR97tICGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4B +AheAAAoJEJRTISRUGSL7XQoH/3Cav4UFYFxHvOgAvBDsbOYbs6FvgOTeRxBJDhFZ +2PmbkyKzKqdBwaruWIkJ3H0q2+fi7OnTkcNynu5viP/I5aqznXzgZ/HqxF6pjhC1 +kNFOW3fFt47ENTyddcxxBcZJnVtaqxPr/eh4ghYmtpnR6IT0wv3HbsnLqW69euRL +ucF1wdP/9fUAsQ8TVa3JNGM0l+poq/+nUwfbzfUWb/hY0ZQ+5n//nILpJVqYwoZG +a/8ynPZlmfEMmKlAOAdceU0S/elyKAeTCbdDSGdKQw7PphWN+oPlit2eKUV7MFus +AGJrP44MPxtaXjwyo4eW+JSVxtLEZdsBZ8wrDbzEr7UraCW5AQ0EVH3u0gEIAPXO +MU3yntkTf2c5Uho9+We7zDsdPcyGcEbsLVBwOjxLYtuSSNRFQZBwgEWBqUv5El9f +5pXszItuEO9aS2P4Ec4XbSRhgq39tiCkHTCeJPb01BrndfxU6dS0xz7uhpW85feM +CQ3PSCmE7xtbA9XHebQOuHvnaS9KHKZqhtQoPuidLQd+3dJXBvyQ84zqqc329SUi +Y5z/GTWGvJFlqYyi0bXqyZBjWRFgGCrCfaNNUvCe/0Yty/K2hve30yfPpppsS8vR +ZKAHvyL4X+ZIxMBA3m+3evZl2v1f8kWmLSQm/68ziJugMmwaU6Ck3PCbEXN4dt8Z +bS5eqcUketP0OG9maLkAEQEAAYkBHwQYAQIACQUCVH3u0gIbDAAKCRCUUyEkVBki ++0YuB/9gVIbEUy+eqsER03zJmWWgwssDuozeSK87bYKdHhfYIOfHPfSTwoUdKNC6 +be6MneHM/MzZGtgOJI0kh/T+EaBbDik56ZKYAfG75woM5Y7sNdwcc4DbfdAiFJOS +PytqKnZNh3CELtAxJhskSAx+3/6KBVvhXP+/ZhFQEdYHxRwZzuh/S4VmccImwqrI +8ewPTxr+HL5XOC916+Mm0KKVTTWYqqCgPvpS40IDTHxH7N7uJH/IempJ6+lhgxXY +xFYtTa+/QMxNR7J8trVEXWZL9mL03yPn0/xsPl9vtBWuDBSoIhDtbu6xb1dKmkmn +OMRmsdLlfGnJZ51LqW56CDhBO+MW +=kKPK +-----END PGP PUBLIC KEY BLOCK-----