Skip to content

Commit

Permalink
Update Dockerfile to pull base images from Artifactory instead of DTR.
Browse files Browse the repository at this point in the history
  • Loading branch information
schooler-hpe committed Apr 6, 2021
1 parent 67cc2d7 commit 2f72e40
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.3
1.7.4
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.7.4] - 2021-04-06

## Changed

- Updated Dockerfile to pull base images from Artifactory instead of DTR.

## [1.7.3] - 2021-02-03

## Changed
Expand Down
26 changes: 23 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
# Copyright 2018-2020 Hewlett Packard Enterprise Development LP
# MIT License
#
# (C) Copyright [2018-2021] Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.

# Dockerfile for building HMS bss.

# Build base just has the packages installed we need.
FROM dtr.dev.cray.com/baseos/golang:1.14-alpine3.12 AS build-base
FROM arti.dev.cray.com/baseos-docker-master-local/golang:1.14-alpine3.12 AS build-base

RUN set -ex \
&& apk update \
Expand Down Expand Up @@ -40,7 +60,7 @@ FROM base AS builder
RUN set -ex && go build -v -i -o /usr/local/bin/boot-script-service stash.us.cray.com/HMS/hms-bss/cmd/boot-script-service

### Final Stage ###
FROM dtr.dev.cray.com/baseos/alpine:3.12
FROM arti.dev.cray.com/baseos-docker-master-local/alpine:3.12
LABEL maintainer="Cray, Inc."
EXPOSE 27778
STOPSIGNAL SIGTERM
Expand Down
9 changes: 0 additions & 9 deletions dev/mimicry/run.sh

This file was deleted.

2 changes: 1 addition & 1 deletion kubernetes/cray-hms-bss/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
description: "Kubernetes resources for cray-hms-bss"
name: "cray-hms-bss"
home: "HMS/hms-bss"
version: 1.7.3
version: 1.7.4

0 comments on commit 2f72e40

Please sign in to comment.