2
0
Эх сурвалжийг харах

Merge branch 'master' of https://github.com/porter-dev/porter into beta.3.integration-frontend

jusrhee 5 жил өмнө
parent
commit
737e59b6ec

+ 4 - 3
.github/workflows/release.yaml

@@ -37,10 +37,10 @@ jobs:
         cat ./dashboard/.env
     - name: Build
       run: |
-        DOCKER_BUILDKIT=1 docker build . -t gcr.io/porter-dev-273614/porter-prov:${{steps.tag_name.outputs.tag}} -f ./docker/Dockerfile
+        DOCKER_BUILDKIT=1 docker build . -t porter1/porter:${{steps.tag_name.outputs.tag}} -f ./docker/Dockerfile
     - name: Push
       run: |
-        docker push gcr.io/porter-dev-273614/porter-prov:${{steps.tag_name.outputs.tag}}
+        docker push porter1/porter:${{steps.tag_name.outputs.tag}}
   build:
     name: Build binaries
     runs-on: ubuntu-latest
@@ -113,6 +113,7 @@ jobs:
           mkdir -p ./release/static
           cd dashboard
           npm i
+          npm i html-webpack-plugin --save-dev
           npm run build
           cd ..
           zip --junk-paths ./release/static/static_${{steps.tag_name.outputs.tag}}.zip ./dashboard/build/*
@@ -364,4 +365,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./release/static/static_${{steps.tag_name.outputs.tag}}.zip
           asset_name: static_${{steps.tag_name.outputs.tag}}.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip

+ 1 - 1
README.md

@@ -69,7 +69,7 @@ For Linux and Windows installation, see our [Docs](https://docs.getporter.dev/do
 
 2. Create a Project and select a cloud provider you want to provision a Kubernetes cluster in.
 
-3. Put in your credentials, then Porter will automatically provision a cluster and an image registry in your own cloud account.
+3. [Put in your credentials](https://docs.getporter.dev/docs/getting-started-with-porter-on-aws), then Porter will automatically provision a cluster and an image registry in your own cloud account.
 
 4. [Build and push your Docker image to the provisioned registry with the CLI](https://docs.getporter.dev/docs/cli-documentation#porter-docker-configure).
 

+ 2 - 2
internal/kubernetes/agent.go

@@ -280,7 +280,7 @@ func (a *Agent) ProvisionEKS(
 		ID:        id,
 		Name:      fmt.Sprintf("prov-%s-%s", id, string(operation)),
 		Kind:      provisioner.EKS,
-		Operation: provisioner.Apply,
+		Operation: operation,
 		Redis:     redisConf,
 		Postgres:  pgConf,
 		AWS: &aws.Conf{
@@ -306,7 +306,7 @@ func (a *Agent) ProvisionTest(
 	prov := &provisioner.Conf{
 		ID:        fmt.Sprintf("%s-%d", "testing", projectID),
 		Name:      fmt.Sprintf("prov-%s-%d-%s", "testing", projectID, string(operation)),
-		Operation: provisioner.Apply,
+		Operation: operation,
 		Kind:      provisioner.Test,
 		Redis:     redisConf,
 		Postgres:  pgConf,

+ 1 - 1
internal/kubernetes/provisioner/provisioner.go

@@ -52,7 +52,7 @@ const (
 func (conf *Conf) GetProvisionerJobTemplate() (*batchv1.Job, error) {
 	operation := string(conf.Operation)
 
-	if conf.Operation == "" {
+	if operation == "" {
 		operation = string(Apply)
 	}