Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MB-6684: archive milmove-orders #85

Merged
merged 1 commit into from
Feb 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
- run:
name: Check for reserved branch names
command: |
if [[ $CIRCLE_BRANCH = latest || $CIRCLE_BRANCH = milmove-app || $CIRCLE_BRANCH = milmove-app-browsers || $CIRCLE_BRANCH = milmove-cypress || $CIRCLE_BRANCH = milmove-infra || $CIRCLE_BRANCH = milmove-orders ]]; then
echo "Don't use a branch named 'latest', 'milmove-app', 'milmove-app-browsers', 'milmove-cypress', 'milmove-infra', 'milmove-orders'; these are meaningful tags."
if [[ $CIRCLE_BRANCH = latest || $CIRCLE_BRANCH = milmove-app || $CIRCLE_BRANCH = milmove-app-browsers || $CIRCLE_BRANCH = milmove-cypress || $CIRCLE_BRANCH = milmove-infra ]]; then
echo "Don't use a branch named 'latest', 'milmove-app', 'milmove-app-browsers', 'milmove-cypress', 'milmove-infra'; these are meaningful tags."
exit 1
fi
- run:
Expand Down Expand Up @@ -51,10 +51,6 @@ jobs:
# milmove-infra-tf13
docker tag milmove/circleci-docker:milmove-infra-tf13 milmove/circleci-docker:milmove-infra-tf13-$tag
docker push milmove/circleci-docker:milmove-infra-tf13-$tag

# milmove-orders
docker tag milmove/circleci-docker:milmove-orders milmove/circleci-docker:milmove-orders-$tag
docker push milmove/circleci-docker:milmove-orders-$tag
done

# push default tags on master
Expand All @@ -65,5 +61,4 @@ jobs:
docker push milmove/circleci-docker:milmove-cypress
docker push milmove/circleci-docker:milmove-infra
docker push milmove/circleci-docker:milmove-infra-tf13
docker push milmove/circleci-docker:milmove-orders
fi
8 changes: 0 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ updates:
open-pull-requests-limit: 10
labels:
- dependencies
- package-ecosystem: docker
directory: "/milmove-orders"
schedule:
interval: weekly
time: "11:00"
open-pull-requests-limit: 10
labels:
- dependencies
- package-ecosystem: docker
directory: "/milmove-app-browsers"
schedule:
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ For the latest stable images:
* `milmove/circleci-docker:milmove-cypress`
* `milmove/circleci-docker:milmove-infra`
* `milmove/circleci-docker:milmove-infra-tf13`
* `milmove/circleci-docker:milmove-orders`

For static tags, use tags including the git hash. You can find the hashes in this repo, from the [CircleCI builds page](https://circleci.com/gh/milmove/circleci-docker/tree/master), or from the [Docker Hub tags](https://hub.docker.com/r/milmove/circleci-docker/tags/) page.

Expand Down Expand Up @@ -67,9 +66,11 @@ In addition to the Base Image this contains:
* [Terraform](https://www.terraform.io/) at version 0.12.x
* [terraform-docs](https://github.com/segmentio/terraform-docs)

### MilMove Orders
### MilMove Orders (deprecated)

In addition to the Base Image this contains:
The code for [milmove/circleci-docker:milmove-orders](https://github.com/transcom/circleci-docker/tree/db683d4df0175a6048e6ef97d872402fe72269dc/milmove-orders) [was deleted](https://github.com/transcom/circleci-docker/pull/85) in February 2021. It is no longer used.

In addition to the Base Image this contained:

* [golang](https://golang.org/)
* [go-swagger](https://github.com/go-swagger/go-swagger)
Expand Down Expand Up @@ -99,8 +100,6 @@ docker pull milmove/circleci-docker:milmove-app-browsers
docker pull milmove/circleci-docker:milmove-cypress
docker pull milmove/circleci-docker:milmove-infra
docker pull milmove/circleci-docker:milmove-infra-tf13
docker pull milmove/circleci-docker:milmove-orders

```

This should build cleanly locally, but an updated image needs to exist to verify you have all the things.
Expand Down
7 changes: 0 additions & 7 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,3 @@ pushd milmove-infra-tf13
docker build -t milmove/circleci-docker:milmove-infra-tf13 \
.
popd

pushd milmove-orders
docker build --build-arg CACHE_APT="$CACHE_APT" \
--build-arg CACHE_PIP="$CACHE_PIP" \
-t milmove/circleci-docker:milmove-orders \
.
popd
49 changes: 0 additions & 49 deletions milmove-orders/Dockerfile

This file was deleted.

13 changes: 1 addition & 12 deletions scripts/find-updates
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,7 @@ function test_milmove_infra_tf13() {
compare_version "${tag}" tfsec --version
}

function test_milmove_orders() {
tag=milmove-orders
echo
echo "Comparing against ${tag} Dockerfile"

compare_version "${tag}" go version
}

for tag in latest milmove-app milmove-app-browsers milmove-infra milmove-orders; do
for tag in latest milmove-app milmove-app-browsers milmove-infra; do
case ${tag} in
latest)
test_latest
Expand All @@ -119,9 +111,6 @@ for tag in latest milmove-app milmove-app-browsers milmove-infra milmove-orders;
milmove-infra-tf13)
test_milmove_infra_tf13
;;
milmove-orders)
test_milmove_orders
;;
esac

done
Expand Down
17 changes: 1 addition & 16 deletions test
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,7 @@ function test_milmove_infra_tf13() {
echo "Passed ${tag}"
}

function test_milmove_orders() {
tag=milmove-orders
echo "Testing ${tag} Dockerfile"

docker run -it "milmove/circleci-docker:${tag}" go version
docker run -it "milmove/circleci-docker:${tag}" swagger version
docker run -it "milmove/circleci-docker:${tag}" which entr
docker run -it "milmove/circleci-docker:${tag}" psql --version

echo "Passed ${tag}"
}

for tag in latest milmove-app milmove-app-browsers milmove-cypress milmove-infra milmove-infra-tf13 milmove-orders; do
for tag in latest milmove-app milmove-app-browsers milmove-cypress milmove-infra milmove-infra-tf13; do
echo
echo "* Testing USER is properly set to 'circleci' on '${tag}' tagged image"
docker run -it "milmove/circleci-docker:${tag}" bash -xc '[[ $(whoami) = circleci ]]'
Expand All @@ -113,9 +101,6 @@ for tag in latest milmove-app milmove-app-browsers milmove-cypress milmove-infra
milmove-infra-tf13)
test_milmove_infra_tf13
;;
milmove-orders)
test_milmove_orders
;;
esac

done
Expand Down