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

Documentation updates and linting #64

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ jobs:
shell: bash
run: |
mkdir dist
cp ./target/x86_64-unknown-linux-musl/release/*_lambda dist
cp ./target/x86_64-unknown-linux-musl/release/berkshire_hog_lambda bootstrap
zip dist/berkshire_hog_lambda.zip bootstrap
- uses: actions/upload-artifact@v3
with:
name: bins-lambda
Expand All @@ -119,10 +120,10 @@ jobs:
echo "tag=${name//v}" >> "$GITHUB_OUTPUT"
- name: Build Docker Images
shell: bash
run: make docker-build VERSION=${{ steps.tagname.outputs.tag }}
run: make docker-build
- name: Save Docker Images
shell: bash
run: make docker-save VERSION=${{ steps.tagname.outputs.tag }}
run: make docker-save
- uses: actions/upload-artifact@v3
with:
name: docker
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ flate2 = "1.0"
tempfile = "3.2"
path-clean = "0.1.0"
anyhow = "1.0"
openssl = { version = "0.10", features = ["vendored"] }

[dev-dependencies]
escargot = "0.5.0"
Expand Down
File renamed without changes.
60 changes: 35 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
null:
@:

docker-build: check-version
@echo Building Rusty Hogs version: $(VERSION)
docker build --tag rust-builder -f Dockerfile.build .
docker build --tag wetfeet2000/ankamali_hog:$(VERSION) --build-arg HOG=ankamali -f Dockerfile.hog .
docker build --tag wetfeet2000/berkshire_hog:$(VERSION) --build-arg HOG=berkshire -f Dockerfile.hog .
docker build --tag wetfeet2000/choctaw_hog:$(VERSION) --build-arg HOG=choctaw -f Dockerfile.hog .
docker build --tag wetfeet2000/duroc_hog:$(VERSION) --build-arg HOG=duroc -f Dockerfile.hog .
docker build --tag wetfeet2000/essex_hog:$(VERSION) --build-arg HOG=essex -f Dockerfile.hog .
docker build --tag wetfeet2000/gottingen_hog:$(VERSION) --build-arg HOG=gottingen -f Dockerfile.hog .
docker build --tag wetfeet2000/hante_hog:$(VERSION) --build-arg HOG=hante -f Dockerfile.hog .
docker-build:
@echo Building Rusty Hog Docker Images
docker build --tag rust-builder -f Dockerfile.builder .
docker build --tag wetfeet2000/ankamali_hog --build-arg HOG=ankamali -f Dockerfile.hog .
docker build --tag wetfeet2000/berkshire_hog --build-arg HOG=berkshire -f Dockerfile.hog .
docker build --tag wetfeet2000/choctaw_hog --build-arg HOG=choctaw -f Dockerfile.hog .
docker build --tag wetfeet2000/duroc_hog --build-arg HOG=duroc -f Dockerfile.hog .
docker build --tag wetfeet2000/essex_hog --build-arg HOG=essex -f Dockerfile.hog .
docker build --tag wetfeet2000/gottingen_hog --build-arg HOG=gottingen -f Dockerfile.hog .
docker build --tag wetfeet2000/hante_hog --build-arg HOG=hante -f Dockerfile.hog .

docker-save: check-version
docker-save:
@echo Saving Rusty Hog Docker Images to archive
docker image save -o images.tar \
wetfeet2000/ankamali_hog:$(VERSION) \
wetfeet2000/berkshire_hog:$(VERSION) \
wetfeet2000/choctaw_hog:$(VERSION) \
wetfeet2000/duroc_hog:$(VERSION) \
wetfeet2000/essex_hog:$(VERSION) \
wetfeet2000/gottingen_hog:$(VERSION) \
wetfeet2000/hante_hog:$(VERSION)
wetfeet2000/ankamali_hog \
wetfeet2000/berkshire_hog \
wetfeet2000/choctaw_hog \
wetfeet2000/duroc_hog \
wetfeet2000/essex_hog \
wetfeet2000/gottingen_hog \
wetfeet2000/hante_hog

docker-load:
@echo Loading Rusty Hog Docker Images from archive
docker load -i images.tar

docker-publish: check-version
docker push wetfeet2000/ankamali_hog:$(VERSION)
docker push wetfeet2000/berkshire_hog:$(VERSION)
docker push wetfeet2000/choctaw_hog:$(VERSION)
docker push wetfeet2000/duroc_hog:$(VERSION)
docker push wetfeet2000/essex_hog:$(VERSION)
docker push wetfeet2000/gottingen_hog:$(VERSION)
docker push wetfeet2000/hante_hog:$(VERSION)
@echo Publishing Rusty Hog Docker Images version: $(VERSION)
docker tag wetfeet2000/ankamali_hog:latest wetfeet2000/ankamali_hog:$(VERSION)
docker tag wetfeet2000/berkshire_hog:latest wetfeet2000/berkshire_hog:$(VERSION)
docker tag wetfeet2000/choctaw_hog:latest wetfeet2000/choctaw_hog:$(VERSION)
docker tag wetfeet2000/duroc_hog:latest wetfeet2000/duroc_hog:$(VERSION)
docker tag wetfeet2000/essex_hog:latest wetfeet2000/essex_hog:$(VERSION)
docker tag wetfeet2000/gottingen_hog:latest wetfeet2000/gottingen_hog:$(VERSION)
docker tag wetfeet2000/hante_hog:latest wetfeet2000/hante_hog:$(VERSION)
docker push -a wetfeet2000/ankamali_hog
docker push -a wetfeet2000/berkshire_hog
docker push -a wetfeet2000/choctaw_hog
docker push -a wetfeet2000/duroc_hog
docker push -a wetfeet2000/essex_hog
docker push -a wetfeet2000/gottingen_hog
docker push -a wetfeet2000/hante_hog

check-version:
@if test ! $(VERSION); then echo "VERSION is undefined"; exit 1; fi
Loading
Loading