diff --git a/.drone.yml b/.drone.yml index f8ab43b..70be3ea 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: docker-build steps: - name: greeting - image: docker:dind + image: docker.shnee.net/shnee/docker:19.03 volumes: - name: dockersock path: /var/run @@ -14,7 +14,7 @@ steps: - make push-all - name: gotify - image: fredix/arm64v8-alpine-drone-gotify + image: fredix/drone-gotify settings: gotifytoken: from_secret: gotify-token @@ -32,7 +32,7 @@ steps: services: - name: docker - image: docker:dind + image: docker.shnee.net/shnee/docker:19.03 privileged: true volumes: - name: dockersock diff --git a/Dockerfile.j2 b/Dockerfile.j2 index f2ed243..62e89a0 100644 --- a/Dockerfile.j2 +++ b/Dockerfile.j2 @@ -1,15 +1,7 @@ FROM {{ base_image_name }}:{{ version }} -# TODO REM add comment. -RUN \ - dnf install -y nfs-utils && \ - mkdir -p /var/cache/dnf && \ - mount \ - -t nfs \ - -o nolock \ - 192.168.1.204:/pool1/package-caches/dnf \ - /var/cache/dnf && \ - echo "keepcache=1" >> /etc/dnf/dnf.conf && \ - dnf install -y ansible && \ - echo yay - # dnf clean all +# Install ansible using dnf. We originally were going to have a flag for whether +# to use dnf or pip to install ansible however it looks like dnf installs all +# the python libs in the same location that pip would, therefore there doesn't +# seem to be a meaningful difference between the 2 install options. +RUN dnf install -y ansible