diff --git a/Dockerfile b/Dockerfile index 3490010eb96811b8c12a05c7c9f53f421fb686da..8e15d195b7bb7738bd701b5f3cc1f9a0600a64d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,14 @@ #### # Build locally: -# docker build --build-arg ssh_private_key="$(cat ~/.ssh/id_rsa)" -t nshmp-netcdf . +# docker build +# --build-arg git_username=<user@name.com> +# --build-arg git_password=<git-api-token> +# -t nshmp-netcdf . #### -# Current project ARG project=nshmp-netcdf - -# Builder work dir ARG workdir=/app/${project} - -# Path to libs dir ARG libs_dir=${workdir}/build/libs - -# Path to jar file ARG jar_file=${libs_dir}/${project}.jar #### @@ -22,20 +18,18 @@ FROM usgs/centos:8 as builder ENV LANG="en_US.UTF-8" -ARG workdir +ARG git_username +ARG git_password ARG libs_dir ARG jar_file -ARG ssh_private_key +ARG workdir + +ENV GIT_NSHMP_USERNAME ${git_username} +ENV GIT_NSHMP_PASSWORD ${git_password} WORKDIR ${workdir} -RUN yum install -y java-11-openjdk which git \ - && eval $(ssh-agent -s) \ - && mkdir -p ~/.ssh \ - && chmod 700 ~/.ssh \ - && echo "${ssh_private_key}" >> ~/.ssh/id_rsa \ - && chmod 0600 ~/.ssh/id_rsa \ - && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config +RUN yum install -y java-11-openjdk which git COPY build.gradle . COPY .git .git diff --git a/build.gradle b/build.gradle index 861d8938635a305a268998156d1dd55cf8180077..0e5d706b97dd7e0ba9d7b2d7a1e28ec245de9aae 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { } git { - implementation("git@code.usgs.gov:ghsc/nshmp/nshmp-lib.git", { + implementation("https://code.usgs.gov/ghsc/nshmp/nshmp-lib.git", { name "nshmp-netcdf-dep--nshmp-lib" tag "v0.0.5" }) diff --git a/settings.gradle b/settings.gradle index 88628f710615cad31ced6139dea5c722e9b2a606..b399b8b2503b39e9e119f7ccbf72337757f27c53 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,3 +3,7 @@ plugins { } rootProject.name = "nshmp-netcdf" + +git { + defaultAuthGroup "nshmp" +}