diff --git a/dockerfiles/ubuntu/Dockerfile b/Dockerfile similarity index 100% rename from dockerfiles/ubuntu/Dockerfile rename to Dockerfile diff --git a/README.md b/README.md index c348a5f9..423f9d72 100644 --- a/README.md +++ b/README.md @@ -365,11 +365,10 @@ environment is consistent across any `docker` enabled platform. When the docker image builds, the test are run inside the docker container, on failure they will stop the build. -Run the tests with the following commands for both `alpine` and `ubuntu` images: +Run the tests with the following command: ```sh -docker build -t git-resource --target tests -f dockerfiles/alpine/Dockerfile . -docker build -t registry-image-resource --target tests -f dockerfiles/ubuntu/Dockerfile --build-arg base_image=ubuntu:latest . +docker build -t registry-image-resource --target tests --build-arg base_image=paketobuildpacks/run-jammy-base:latest . ``` diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile deleted file mode 100644 index fa1d143d..00000000 --- a/dockerfiles/alpine/Dockerfile +++ /dev/null @@ -1,206 +0,0 @@ -ARG base_image=alpine:latest - -FROM ${base_image} AS resource - -RUN apk update && apk upgrade -RUN apk --no-cache add \ - bash \ - curl \ - git \ - git-daemon \ - git-lfs \ - gnupg \ - gzip \ - jq \ - openssl-dev \ - make \ - g++ \ - openssh \ - perl \ - tar \ - libstdc++ \ - coreutils - -WORKDIR /root -RUN git clone https://github.com/proxytunnel/proxytunnel.git && \ - cd proxytunnel && \ - make -j4 && \ - install -c proxytunnel /usr/bin/proxytunnel && \ - cd .. && \ - rm -rf proxytunnel - -RUN git config --global user.email "git@localhost" -RUN git config --global user.name "git" -RUN git config --global pull.rebase "false" -RUN git config --global protocol.file.allow "always" - -ADD assets/ /opt/resource/ -RUN chmod +x /opt/resource/* - -ENV CXXFLAGS -DOPENSSL_API_COMPAT=0x30000000L -ADD scripts/install_git_crypt.sh install_git_crypt.sh -RUN ./install_git_crypt.sh && rm ./install_git_crypt.sh - -WORKDIR /usr/libexec/git-core -RUN rm -f \ - git-add \ - git-add--interactive \ - git-annotate \ - git-apply \ - git-archimport \ - git-archive \ - git-bisect--helper \ - git-blame \ - git-branch \ - git-bundle \ - git-credential-cache \ - git-credential-cache--daemon \ - git-credential-store \ - git-cat-file \ - git-check-attr \ - git-check-ignore \ - git-check-mailmap \ - git-check-ref-format \ - git-checkout \ - git-checkout-index \ - git-cherry \ - git-cherry-pick \ - git-clean \ - git-clone \ - git-column \ - git-commit \ - git-commit-tree \ - git-config \ - git-count-objects \ - git-credential \ - git-cvsexportcommit \ - git-cvsimport \ - git-cvsserver \ - git-describe \ - git-diff \ - git-diff-files \ - git-diff-index \ - git-diff-tree \ - git-difftool \ - git-fast-export \ - git-fast-import \ - git-fetch \ - git-fetch-pack \ - git-fmt-merge-msg \ - git-for-each-ref \ - git-format-patch \ - git-fsck \ - git-fsck-objects \ - git-gc \ - git-get-tar-commit-id \ - git-grep \ - git-hash-object \ - git-help \ - git-http-backend\ - git-imap-send \ - git-index-pack \ - git-init \ - git-init-db \ - git-lfs \ - git-log \ - git-ls-files \ - git-ls-remote \ - git-ls-tree \ - git-mailinfo \ - git-mailsplit \ - git-merge \ - git-mktag \ - git-mktree \ - git-mv \ - git-name-rev \ - git-notes \ - git-p4 \ - git-pack-objects \ - git-pack-redundant \ - git-pack-refs \ - git-patch-id \ - git-peek-remote \ - git-prune \ - git-prune-packed \ - git-push \ - git-read-tree \ - git-reflog \ - git-relink \ - git-remote \ - git-remote-ext \ - git-remote-fd \ - git-remote-testsvn \ - git-repack \ - git-replace \ - git-repo-config \ - git-rerere \ - git-reset \ - git-rev-list \ - git-rev-parse \ - git-revert \ - git-rm \ - git-send-email \ - git-send-pack \ - git-shell \ - git-shortlog \ - git-show \ - git-show-branch \ - git-show-index \ - git-show-ref \ - git-stage \ - git-show-ref \ - git-stage \ - git-status \ - git-stripspace \ - git-svn \ - git-symbolic-ref \ - git-tag \ - git-tar-tree \ - git-unpack-file \ - git-unpack-objects \ - git-update-index \ - git-update-ref \ - git-update-server-info \ - git-upload-archive \ - git-var \ - git-verify-pack \ - git-verify-tag \ - git-whatchanged \ - git-write-tree - -WORKDIR /usr/bin -RUN rm -f \ - git-cvsserver \ - git-shell \ - git-receive-pack \ - git-upload-pack \ - git-upload-archive &&\ - ln -s git git-upload-archive &&\ - ln -s git git-crypt - -WORKDIR /usr/libexec/git-core -RUN ln -s git git-merge - -WORKDIR /usr/share -RUN rm -rf \ - gitweb \ - locale \ - perl \ - perl5 - -WORKDIR /usr/lib -RUN rm -rf \ - perl \ - perl5 - -FROM resource AS tests -ADD test/ /tests -RUN /tests/all.sh - -FROM resource AS integrationtests -RUN apk --no-cache add squid -ADD test/ /tests/test -ADD integration-tests /tests/integration-tests -RUN /tests/integration-tests/integration.sh - -FROM resource