Skip to content
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.

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

Adding k3s alternative to docker-compose #403

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
29a79fd
Replacing docker-compose by k3s
davidferlay Nov 30, 2021
0f50bb6
Update
davidferlay Jan 10, 2022
3619962
Update
davidferlay Jan 11, 2022
1100092
Update
davidferlay Jan 11, 2022
3d50cb4
Update
davidferlay Jan 11, 2022
6ea87c5
Update
davidferlay Jan 11, 2022
8bdebf8
Update
davidferlay Jan 11, 2022
fe799ae
Update
davidferlay Jan 11, 2022
3eda9d2
Update
davidferlay Jan 20, 2022
b2bf238
Update
davidferlay Jan 20, 2022
b2bb446
Update
davidferlay Jan 20, 2022
fa0ef54
Update
davidferlay Jan 20, 2022
3c12f8c
Update
davidferlay Jan 20, 2022
120c0cb
Update
davidferlay Jan 21, 2022
75a5ad9
Update
davidferlay Jan 21, 2022
8d0623f
Update
davidferlay Jan 21, 2022
aab4ae9
Update
davidferlay Jan 26, 2022
8130a77
Update
davidferlay Jan 26, 2022
960f407
Update
davidferlay Jan 27, 2022
5adef30
Update
davidferlay Jan 27, 2022
8232ef3
Update
davidferlay Jan 28, 2022
8ed8814
Update
davidferlay Jan 28, 2022
2d861db
Update
davidferlay Jan 28, 2022
1f43d2f
Update
davidferlay Jan 28, 2022
92305ac
Update
davidferlay Jan 31, 2022
7b7222f
Update
davidferlay Jan 31, 2022
b6ea482
Update
davidferlay Jan 31, 2022
f74e8db
Update
davidferlay Jan 31, 2022
4137491
Update
davidferlay Jan 31, 2022
2063c33
Update
davidferlay Jan 31, 2022
872470d
Update
davidferlay Feb 1, 2022
bb1e0e8
Update
davidferlay Feb 1, 2022
802e27c
Update
davidferlay Feb 1, 2022
dc600cb
Update
davidferlay Feb 2, 2022
83e09a1
Update
davidferlay Feb 2, 2022
51a8fdc
Update
davidferlay Feb 2, 2022
4e881fb
Update
davidferlay Feb 10, 2022
525a808
Update
davidferlay May 10, 2022
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
Prev Previous commit
Next Next commit
Update
  • Loading branch information
davidferlay committed Jan 21, 2022
commit 75a5ad9f5baa50378bb43cb2dcc93fe34a159818
4 changes: 2 additions & 2 deletions scripts/makefile/front.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ x:
frontexec = make -s lookfork3s; kubectl run "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)" --image=$(IMAGE_FRONT) --rm -i --quiet --overrides='{ "kind": "Pod", "apiVersion": "v1", "spec": { "volumes": [ { "name": "host-volume", "hostPath": { "path": "$(CURDIR)/web/themes/custom/$(THEME_NAME)" } } ], "containers": [ { "name": "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)", "image": "$(IMAGE_FRONT)", "command": $(shell $(call jsonarrayconverter,${1})), "workingDir": "/app", "volumeMounts": [ { "name": "host-volume", "mountPath": "/app" } ], "terminationMessagePolicy": "FallbackToLogsOnError", "imagePullPolicy": "IfNotPresent" } ], "restartPolicy": "Never", "securityContext": { "runAsUser": $(CUID), "runAsGroup": $(CGID) } } }'

# Execute front container function on localhost:FRONT_PORT. Needed for dynamic storybook
frontexec-with-port = kubectl run "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)" --image=$(IMAGE_FRONT) --rm -i --overrides='{ "kind": "Pod", "apiVersion": "v1", "spec": { "volumes": [ { "name": "host-volume", "hostPath": { "path": "$(CURDIR)/web/themes/custom/$(THEME_NAME)" } } ], "containers": [ { "name": "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)", "image": "$(IMAGE_FRONT)", "command": $(shell $(call jsonarrayconverter,${1})), "stdin": true, "tty": true, "ports": [ { "containerPort": $(FRONT_PORT), "protocol": "TCP" } ], "workingDir": "/app", "volumeMounts": [ { "name": "host-volume", "mountPath": "/app" } ], "terminationMessagePolicy": "FallbackToLogsOnError", "imagePullPolicy": "IfNotPresent" } ], "restartPolicy": "Never", "securityContext": { "runAsUser": $(CUID), "runAsGroup": $(CGID) } } }'
frontexec-with-port = make -s lookfork3s; kubectl run "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)" --image=$(IMAGE_FRONT) --rm -i --overrides='{ "kind": "Pod", "apiVersion": "v1", "spec": { "volumes": [ { "name": "host-volume", "hostPath": { "path": "$(CURDIR)/web/themes/custom/$(THEME_NAME)" } } ], "containers": [ { "name": "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)", "image": "$(IMAGE_FRONT)", "command": $(shell $(call jsonarrayconverter,${1})), "stdin": true, "tty": true, "ports": [ { "containerPort": $(FRONT_PORT), "protocol": "TCP" } ], "workingDir": "/app", "volumeMounts": [ { "name": "host-volume", "mountPath": "/app" } ], "terminationMessagePolicy": "FallbackToLogsOnError", "imagePullPolicy": "IfNotPresent" } ], "restartPolicy": "Never", "securityContext": { "runAsUser": $(CUID), "runAsGroup": $(CGID) } } }'

# Execute front container with TTY. Needed for storybook components creation
frontexec-with-interactive = kubectl run "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)" --image=$(IMAGE_FRONT) --rm -i --overrides='{ "kind": "Pod", "apiVersion": "v1", "spec": { "volumes": [ { "name": "host-volume", "hostPath": { "path": "$(CURDIR)/web/themes/custom/$(THEME_NAME)" } } ], "containers": [ { "name": "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)", "image": "$(IMAGE_FRONT)", "command": $(shell $(call jsonarrayconverter,${1})), "stdin": true, "tty": true, "workingDir": "/app", "volumeMounts": [ { "name": "host-volume", "mountPath": "/app" } ], "terminationMessagePolicy": "FallbackToLogsOnError", "imagePullPolicy": "IfNotPresent" } ], "restartPolicy": "Never", "securityContext": { "runAsUser": $(CUID), "runAsGroup": $(CGID) } } }'
frontexec-with-interactive = make -s lookfork3s; kubectl run "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)" --image=$(IMAGE_FRONT) --rm -i --overrides='{ "kind": "Pod", "apiVersion": "v1", "spec": { "volumes": [ { "name": "host-volume", "hostPath": { "path": "$(CURDIR)/web/themes/custom/$(THEME_NAME)" } } ], "containers": [ { "name": "$(COMPOSE_PROJECT_NAME)-$(RANDOM_STRING)", "image": "$(IMAGE_FRONT)", "command": $(shell $(call jsonarrayconverter,${1})), "stdin": true, "tty": true, "workingDir": "/app", "volumeMounts": [ { "name": "host-volume", "mountPath": "/app" } ], "terminationMessagePolicy": "FallbackToLogsOnError", "imagePullPolicy": "IfNotPresent" } ], "restartPolicy": "Never", "securityContext": { "runAsUser": $(CUID), "runAsGroup": $(CGID) } } }'


clear-front:
Expand Down