Skip to content

refactor: move main.go to cmd/jail for standard Go project layout #13

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Sep 10, 2025
Merged

refactor: move main.go to cmd/jail for standard Go project layout #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd5ba1d
better error handling
f0ssel Sep 10, 2025
22ade90
update build scripts and workflows for cmd/jail project structure
blink-so[bot] Sep 10, 2025
b0e7507
create jail package interface in repository root
blink-so[bot] Sep 10, 2025
a4951b1
remove Run convenience method from jail interface
blink-so[bot] Sep 10, 2025
4288e19
Revert "remove Run convenience method from jail interface"
blink-so[bot] Sep 10, 2025
d16da48
Revert "create jail package interface in repository root"
blink-so[bot] Sep 10, 2025
9829aba
remove empty jail.go file that was causing test failures
blink-so[bot] Sep 10, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
fi
# Build using Go directly for cross-compilation
go build -ldflags="-s -w -X main.version=$VERSION" -o ${{ matrix.name }} .
go build -ldflags="-s -w -X main.version=$VERSION" -o ${{ matrix.name }} ./cmd/jail
- name: Upload binary as artifact
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
export CGO_ENABLED=0
# Build using Go directly for cross-compilation
go build -ldflags="-s -w -X main.version=${{ github.ref_name }}" -o ${{ matrix.name }} .
go build -ldflags="-s -w -X main.version=${{ github.ref_name }}" -o ${{ matrix.name }} ./cmd/jail
- name: Upload binary as artifact
uses: actions/upload-artifact@v4
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
*.dll
*.so
*.dylib
jail
jail.exe

# Test binary, built with `go test -c`
*.test
Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ all: build
build:
@echo "Building $(BINARY_NAME) for current platform..."
@echo "Version: $(VERSION)"
go build -ldflags="$(LDFLAGS)" -o $(BINARY_NAME) .
go build -ldflags="$(LDFLAGS)" -o $(BINARY_NAME) ./cmd/jail
@echo "✓ Built $(BINARY_NAME)"

# Build for all supported platforms
Expand All @@ -25,13 +25,13 @@ build-all:
@echo "Version: $(VERSION)"
@mkdir -p $(BUILD_DIR)
@echo "Building Linux amd64..."
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 .
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-amd64 ./cmd/jail
@echo "Building Linux arm64..."
GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 .
GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 ./cmd/jail
@echo "Building macOS amd64..."
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-amd64 .
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-amd64 ./cmd/jail
@echo "Building macOS arm64..."
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 .
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-darwin-arm64 ./cmd/jail
@echo "✓ All binaries built successfully!"
@echo "Binaries are in the '$(BUILD_DIR)' directory:"
@ls -la $(BUILD_DIR)/
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sudo mv jail /usr/local/bin/
```bash
git clone https://github.com/coder/jail
cd jail
make build # or: go build -o jail .
make build # or: go build -o jail ./cmd/jail
```

### Usage
Expand Down Expand Up @@ -162,7 +162,7 @@ cd jail
make build

# Or directly with Go
go build -o jail .
go build -o jail ./cmd/jail
```

## Command-Line Options
Expand Down Expand Up @@ -207,14 +207,14 @@ make lint

```bash
# Build directly with Go
go build -o jail .
go build -o jail ./cmd/jail

# Run tests
go test ./...

# Cross-compile manually
GOOS=linux GOARCH=amd64 go build -o jail-linux .
GOOS=darwin GOARCH=amd64 go build -o jail-macos .
GOOS=linux GOARCH=amd64 go build -o jail-linux ./cmd/jail
GOOS=darwin GOARCH=amd64 go build -o jail-macos ./cmd/jail

# Use build script for all platforms
./scripts/build.sh
Expand Down
0 main.go → cmd/jail/main.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ for config in "${configs[@]}"; do

env GOOS="$goos" GOARCH="$goarch" CGO_ENABLED=0 go build \
-ldflags="-s -w -X main.version=$VERSION" \
-o "$BUILD_DIR/$name" .
-o "$BUILD_DIR/$name" ./cmd/jail

if [ $? -eq 0 ]; then
size=$(du -h "$BUILD_DIR/$name" | cut -f1)
Expand Down
Loading