Adding proxy for pypi

This commit is contained in:
James Jones
2023-10-01 10:38:04 -04:00
parent 9e48128ff9
commit 5da253d2d2
2 changed files with 7 additions and 8 deletions

View File

@@ -20,13 +20,12 @@ stages:
.shared_resources:
script: &build_push
- docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY
- podman login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY
- export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]')
- docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY .
- docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG"
- podman build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY .
- podman push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG"
before_script: &before_auth
- dnf install -y podman-docker
- docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY
- podman login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY
build:prereleases:
stage: dind-build
@@ -58,8 +57,8 @@ build:releases:
script:
- export IMAGE_TAG=$CI_COMMIT_TAG
- *build_push
- docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest"
- docker push "$REGISTRY_IMAGE_LOWER:latest"
- podman tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest"
- podman push "$REGISTRY_IMAGE_LOWER:latest"
only:
refs:
- tags

View File

@@ -6,7 +6,7 @@ FROM ${ARTIFACTORY}/podman/stable:latest
RUN dnf install -y podman-docker buildah skopeo \
util-linux ansible-core openssh-clients krb5-devel krb5-libs krb5-workstation git jq wget curl unzip coreutils \
helm doctl kubernetes-client gnupg2 pinentry expect gh awscli \
python3-jsonpatch python3-requests-oauthlib python3-kubernetes \
python3-jsonpatch python3-requests-oauthlib python3-kubernetes python3-pip \
&& rpm --import https://packages.microsoft.com/keys/microsoft.asc \
&& dnf install -y https://packages.microsoft.com/config/rhel/9.0/packages-microsoft-prod.rpm \
&& dnf install -y azure-cli \