From 5a04907bc542ce4861095b064674ad77319ecdce Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@badhouseplants.net>
Date: Tue, 19 Mar 2024 16:58:05 +0100
Subject: [PATCH] Try building an image

---
 .woodpecker/build.yaml | 29 +++++++++++++++++++++++++++++
 Containerfile          |  8 ++++----
 api/v1/accounts.go     | 12 ++++++------
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 .woodpecker/build.yaml

diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
new file mode 100644
index 0000000..2091dc3
--- /dev/null
+++ b/.woodpecker/build.yaml
@@ -0,0 +1,29 @@
+---
+when:
+  event:
+    - push
+
+steps:
+  build:
+    image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:ff4a98f2acb557ad443f279627036bebf06bc4f1
+    name: Build shoebill operator image
+    privileged: true
+    environment:
+      - PACKAGE_NAME=softplayer/softplayer-backend
+    commands:
+      - |
+        if [[ "${CI_COMMIT_TAG}" ]]; then
+          export CUSTOM_TAG="${CI_COMMIT_TAG}";
+        fi
+      - build-container
+    secrets:
+      - gitea_token
+    backend_options:
+      kubernetes:
+        resources:
+          requests:
+            memory: 500Mi
+            cpu: 200m
+          limits:
+            memory: 1000Mi
+            cpu: 1000m
diff --git a/Containerfile b/Containerfile
index fa83306..11078d3 100644
--- a/Containerfile
+++ b/Containerfile
@@ -4,9 +4,9 @@ WORKDIR /app
 COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
-COPY *.go ./
-RUN CGO_ENABLED=0 GOOS=linux go build -o /softplayer-backend
+COPY . ./
+RUN CGO_ENABLED=0 GOOS=linux go build -o /app
 
 FROM scratch
-COPY --from=0 /app/softplayer-backend /bin/softplayer-backend
-CMD ["/bin/softplayer-backend"]
+COPY --from=0 /app /app
+CMD ["/app"]
diff --git a/api/v1/accounts.go b/api/v1/accounts.go
index b93fb63..8b22396 100644
--- a/api/v1/accounts.go
+++ b/api/v1/accounts.go
@@ -19,7 +19,7 @@ type AccountsServer struct {
 	Controller ctrl.Manager
 }
 
-func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithKubeConfig, error) {
+func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithToken, error) {
 	data := controllers.AccountData{
 		Username: in.Data.GetName(),
 		Password: in.AccountPassword.GetPassword(),
@@ -33,7 +33,7 @@ func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPas
 		return nil, err
 	}
 
-	return &accounts.AccountFullWithKubeConfig{
+	return &accounts.AccountFullWithToken{
 		Id: &accounts.AccountId{
 			Id: acc.Data.UUID,
 		},
@@ -41,11 +41,11 @@ func (a *AccountsServer) SignUp(ctx context.Context, in *accounts.AccountWithPas
 			Name:  acc.Data.Username,
 			Email: acc.Data.Email,
 		},
-		Kubeconfig: acc.Kubeconfig,
+		Token: acc.Kubeconfig,
 	}, nil
 }
 
-func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithKubeConfig, error) {
+func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPassword) (*accounts.AccountFullWithToken, error) {
 	data := controllers.AccountData{
 		Username: in.Data.GetName(),
 		Password: in.AccountPassword.GetPassword(),
@@ -58,7 +58,7 @@ func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPas
 	if err := acc.Login(ctx); err != nil {
 		return nil, err
 	}
-	return &accounts.AccountFullWithKubeConfig{
+	return &accounts.AccountFullWithToken{
 		Id:         &accounts.AccountId{
 			Id: acc.Data.UUID,
 		},
@@ -66,6 +66,6 @@ func (a *AccountsServer) SignIn(ctx context.Context, in *accounts.AccountWithPas
 			Name:  acc.Data.Username,
 			Email: acc.Data.Email,
 		},
-		Kubeconfig: acc.Kubeconfig,
+		Token: acc.Kubeconfig,
 	}, nil
 }