Skip to content

Commit

Permalink
Merge pull request #1 from appuio/initial_fork
Browse files Browse the repository at this point in the history
Initial port and adapt
  • Loading branch information
tobru authored Oct 20, 2022
2 parents a96b6f6 + 70c019e commit cf02967
Show file tree
Hide file tree
Showing 39 changed files with 179 additions and 1,598 deletions.
29 changes: 0 additions & 29 deletions .codeclimate.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
blank_issues_enabled: false

# TODO: Redirect support questions
# contact_links:
# - name: ❓ Question
# url: https://github.com/<org>/<repo>/discussions
# about: Ask or discuss with us, we're happy to help 🙋
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
- [ ] Categorize the PR by setting a good title and adding one of the labels:
`bug`, `enhancement`, `documentation`, `change`, `breaking`, `dependency`
as they show up in the changelog
- [ ] Update tests.
- [ ] Link this PR to related issues.

<!--
Expand Down
82 changes: 0 additions & 82 deletions .github/workflows/docs.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/test.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
/.github/release-notes.md

# Build
# TODO: Adjust binary file name
/go-bootstrap
/tcp-over-socks
*.out

# Docs
Expand Down
5 changes: 1 addition & 4 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ builds:
goos:
- linux
goarm:
- 8
- "8"

archives:
- format: binary
Expand All @@ -22,7 +22,6 @@ snapshot:
name_template: "{{ incpatch .Version }}-snapshot"

dockers:
# TODO: Adjust image locations
- goarch: amd64
use: buildx
build_flag_templates:
Expand All @@ -38,8 +37,6 @@ dockers:
- "{{ .Env.REGISTRY }}/{{ .Env.IMAGE_NAME }}:v{{ .Version }}-arm64"

docker_manifests:
# TODO: Adjust image locations

## ghcr.io
# For prereleases, updating `latest` does not make sense.
# Only the image for the exact version should be pushed.
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ RUN \
ca-certificates \
tzdata

# TODO: Adjust binary file name
ENTRYPOINT ["go-bootstrap"]
COPY go-bootstrap /usr/bin/
ENTRYPOINT ["tcp-over-socks"]
COPY tcp-over-socks /usr/bin/

USER 65536:0
43 changes: 18 additions & 25 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
BSD 3-Clause License
MIT License

Copyright (c) 2022, VSHN AG
All rights reserved.
Copyright (c) 2022 isayme
Copyright (c) 2022 VSHN AG

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
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:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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.
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ build-bin: fmt vet ## Build binary
build-docker: build-bin ## Build docker image
$(DOCKER_CMD) build -t $(CONTAINER_IMG) .

.PHONY: test
test: test-go ## All-in-one test

.PHONY: test-go
test-go: ## Run unit tests against code
go test -race -coverprofile cover.out -covermode atomic ./...

.PHONY: fmt
fmt: ## Run 'go fmt' against code
go fmt ./...
Expand Down
5 changes: 2 additions & 3 deletions Makefile.vars.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
## These are some common variables for Make

PROJECT_ROOT_DIR = .
# TODO: Adjust project meta
PROJECT_NAME ?= go-bootstrap
PROJECT_OWNER ?= vshn
PROJECT_NAME ?= tcp-over-socks
PROJECT_OWNER ?= appuio

WORK_DIR = $(PWD)/.work

Expand Down
Loading

0 comments on commit cf02967

Please sign in to comment.