diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..668c066b801c3b538a9f347f61abe966d677115b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +docker/osdu.entrypoint.sh text eol=lf diff --git a/docker/binaries/aws_sdapi_linux64_3.1.32.tar.gz b/docker/binaries/aws_sdapi_linux64_3.1.32.tar.gz deleted file mode 100644 index 8c48c6a990e1c0cc74184fabca6ffef200498302..0000000000000000000000000000000000000000 Binary files a/docker/binaries/aws_sdapi_linux64_3.1.32.tar.gz and /dev/null differ diff --git a/docker/osdu.Dockerfile b/docker/osdu.Dockerfile index e84494b8b48780da8c0c038e148334f090ed64be..f11a2730a63df243290f0044d4a477e1c2a5f92c 100644 --- a/docker/osdu.Dockerfile +++ b/docker/osdu.Dockerfile @@ -46,7 +46,8 @@ LABEL maintainer="info@bluware.com" \ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" \ AWS_SHARED_CREDENTIALS_FILE="/data/aws.credentials" \ - GOOGLE_APPLICATION_CREDENTIALS="/data/gcp.json" + GOOGLE_APPLICATION_CREDENTIALS="/data/gcp.json" \ + CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" RUN apt update && \ apt upgrade -y --no-install-recommends && \ diff --git a/docker/osdu.aws.Dockerfile b/docker/osdu.aws.Dockerfile deleted file mode 100644 index 94cb7dde582b4e0c5cc2f37f6d5799956c784434..0000000000000000000000000000000000000000 --- a/docker/osdu.aws.Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -# This Docker build simply uses the latest image of the openvds-ingestion image, and replaces -# the sdapi library with the one built for AWS. -# -# This is only a temporary measure, until AWS's code changes to sdapi can be made public. - -FROM community.opengroup.org:5555/osdu/platform/domain-data-mgmt-services/seismic/open-vds/openvds-ingestion:latest - -WORKDIR /root -COPY binaries/aws_sdapi_linux64_3.1.32.tar.gz /root/aws_sdapi_linux64_3.1.32.tar.gz -RUN tar zxf /root/aws_sdapi_linux64_3.1.32.tar.gz && \ - cp /root/sdapi-3.1.32/lib/linux64/libsdapi.so.3.1.32 /usr/lib/libsdapi.so.0.0.0 diff --git a/docker/osdu.entrypoint.sh b/docker/osdu.entrypoint.sh index 656547ef1278b1058e8c0683245d6d16307fe148..de88d40e8fd2538099c31a7a253d3b8da3af800d 100755 --- a/docker/osdu.entrypoint.sh +++ b/docker/osdu.entrypoint.sh @@ -19,6 +19,10 @@ VDSInfo|info) shift exec VDSInfo "$@" ;; +VDSCopy|copy) + shift + exec VDSCopy "$@" + ;; esac echo OpenVDS Import/Export image diff --git a/tools/VDSCopy/VDSCopy.cpp b/tools/VDSCopy/VDSCopy.cpp index a089bc3d780a72c1fbbd6e26edebd1e572e53161..bb292fa17cd51ffff8549100e82a738af8604695 100644 --- a/tools/VDSCopy/VDSCopy.cpp +++ b/tools/VDSCopy/VDSCopy.cpp @@ -62,7 +62,10 @@ bool flushFutureBufer(std::vector>& futures, bool jsonOut { percentage = newPercentage; if (!jsonOutput) + { fmt::print(stdout, "\r {:3}% Done.", percentage); + fflush(stdout); + } } } futures.clear();