Skip to content

Commit

Permalink
Merge pull request #19 from wbancer-reef/alpine-support
Browse files Browse the repository at this point in the history
Added static linux package building to support Alpine Linux
  • Loading branch information
mszumocki-reef committed Jul 6, 2021
2 parents 98ab033 + 63ea376 commit 4a0782c
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 43 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
* Support SSE-C encryption mode for files
* Initial (experimental) support for Alpine Linux

## [0.5.0] - 2021-05-31

Expand Down
9 changes: 9 additions & 0 deletions python-bindings/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ NAME=py-terraform-provider-b2
DIR=b2_terraform
EGG_INFO=${NAME}.egg-info
SPEC=${NAME}.spec
UNAME_=$(shell uname)

default: build

.PHONY: deps format lint testacc clean build

deps:
@pip install -r requirements-dev.txt
ifeq ($(UNAME_),Linux)
@pip install -r requirements-dev-linux.txt
endif

format:
@black -Sl 100 ${DIR}
Expand All @@ -25,6 +29,11 @@ clean:

build:
@pyinstaller --log-level WARN --onefile ${SPEC}
ifeq ($(UNAME_),Linux)
@mv dist/py-terraform-provider-b2 dist/py-terraform-provider-b2-linked
@staticx dist/py-terraform-provider-b2-linked dist/py-terraform-provider-b2
@rm dist/py-terraform-provider-b2-linked
endif
ifneq ($(origin CI), undefined)
@echo "::set-output name=version::$(subst refs/tags/v,,${GITHUB_REF})"
endif
Expand Down
3 changes: 3 additions & 0 deletions python-bindings/requirements-dev-linux.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
patchelf-wrapper~=1.2.0
staticx~=0.12.2

3 changes: 2 additions & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/Backblaze/terraform-provider-b2/tools
go 1.15

require (
github.com/golangci/golangci-lint v1.40.1
github.com/golangci/golangci-lint v1.41.1
github.com/hashicorp/terraform-plugin-docs v0.4.0
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
)
Loading

0 comments on commit 4a0782c

Please sign in to comment.