Skip to content
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
1 change: 0 additions & 1 deletion .github/actions/version-matrix/.gitignore

This file was deleted.

23 changes: 0 additions & 23 deletions .github/actions/version-matrix/action.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/actions/version-matrix/build_versions.py

This file was deleted.

2 changes: 0 additions & 2 deletions .github/actions/version-matrix/requirements.txt

This file was deleted.

Empty file.
10 changes: 0 additions & 10 deletions .github/actions/version-matrix/version_matrix/constant.py

This file was deleted.

93 changes: 0 additions & 93 deletions .github/actions/version-matrix/version_matrix/matrix_builder.py

This file was deleted.

69 changes: 0 additions & 69 deletions .github/actions/version-matrix/version_matrix/release_versions.py

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
secrets: inherit
with:
matrix: ${{ needs.version_matrix.outputs.matrix }}
distribution: bookworm-slim
distribution: bookworm
max-retries: 3
push: true

Expand All @@ -43,6 +43,6 @@ jobs:
secrets: inherit
with:
matrix: ${{ needs.version_matrix.outputs.matrix }}
distribution: bookworm-slim
distribution: bookworm
max-retries: 0
push: false
2 changes: 1 addition & 1 deletion .github/workflows/subflow-detect-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:

- name: Detect versions
id: generate-matrix
uses: ./.github/actions/version-matrix
uses: spaulg/php-version-matrix-action@main
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
/internal/querybuilder
/internal/telemetry
/.env
/build
/build
/work
1 change: 1 addition & 0 deletions function_build_php_image.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func (m *PhpDevContainers) BuildPhpImage(
WithEnvVariable("DEBIAN_FRONTEND", "noninteractive").
WithExec([]string{"sh", "-c", "rm /var/lib/dpkg/info/libc-bin.*"}).
WithExec([]string{"apt-get", "clean"}).
WithExec([]string{"rm", "-rf", "/var/lib/apt/lists/*"}).
WithExec([]string{"apt", "update", "-y"}).
WithExec([]string{"apt", "upgrade", "-y"}).
WithExec([]string{"apt", "install", "-y", "libc-bin"}).
Expand Down
10 changes: 6 additions & 4 deletions function_build_php_packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package main

import (
"context"
"github.com/spaulg/php-dev-containers/internal/dagger"
"fmt"
"github.com/dchest/uniuri"
"github.com/spaulg/php-dev-containers/internal/dagger"
"runtime"
"strings"
)
Expand All @@ -22,11 +22,11 @@ type PhpVersion struct {
func (m *PhpDevContainers) BuildPhpPackages(
ctx context.Context,

// Source archive file path
// Source archive file path
sourceArchive *dagger.File,

// List of architectures to build packages for, in addition to the native architecture
//+optional
// List of architectures to build packages for, in addition to the native architecture
//+optional
architectures *string,
) (*dagger.Directory, error) {
var err error
Expand Down Expand Up @@ -71,6 +71,8 @@ func (m *PhpDevContainers) BuildPhpPackages(
// Prepare environment
container, err = container.
WithEnvVariable("DEBIAN_FRONTEND", "noninteractive").
WithExec([]string{"apt-get", "clean"}).
WithExec([]string{"rm", "-rf", "/var/lib/apt/lists/*"}).
WithExec([]string{"apt", "update", "-y"}).
WithExec([]string{"apt", "upgrade", "-y"}).
WithExec([]string{"apt", "install", "-y", "build-essential", "devscripts", "quilt", "git", "sudo"}).
Expand Down
Loading