391 add company picture attribut to jobs

.github/workflows/backend-e2etest.yaml

@@ -12,10 +12,10 @@ jobs:
   e2etest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: 1.18
       - name: Run Backend Tests
         working-directory: ./backend
         run: make docker-e2etest

.github/workflows/backend-lint.yaml

@@ -13,16 +13,13 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Setup
-        uses:
-          actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses:
+          actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: 1.18
         id: go
 
-      - name: Checkout
-        uses: actions/checkout@v2
-
       - name: Run lint
         run: make lint
         working-directory: ./backend

.github/workflows/backend-test.yaml

@@ -12,10 +12,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.16
+          go-version: 1.18
       - name: Run Backend Tests
         working-directory: ./backend
         run: make test

.gitignore

@@ -17,6 +17,7 @@
 #application
 jobsika
 postgres-data
+minio-data
 .env
 .opencollective-env
 

backend/.docker-env

@@ -3,3 +3,9 @@ POSTGRES_PASSWORD=storage
 POSTGRES_USER=storage
 POSTGRES_HOST=postgres
 POSTGRES_PORT=5432
+MINIO_ROOT_USER=minioadmin
+MINIO_ROOT_PASSWORD=minioadmin
+S3_ACCESS_KEY=minioadminaccesskey
+S3_SECRET_KEY=minioadminsecretkey
+S3_ENDPOINT=http://minio:9000
+S3_BUCKET=jobsika

backend/.golangci.yml

@@ -7,6 +7,6 @@ linters:
     - gosimple
     - unused
     - structcheck
-    - staticcheck
+#     - staticcheck
     - typecheck
     - varcheck

backend/.s3-env

@@ -0,0 +1,4 @@
+S3_ACCESS_KEY=minioadminaccesskey
+S3_SECRET_KEY=minioadminsecretkey
+S3_ENDPOINT=http://minio:9000
+S3_BUCKET=jobsika

backend/Dockerfile

@@ -37,6 +37,6 @@ COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=base /dist/api /
 
 # expose api port
-EXPOSE 7000
+EXPOSE 7001
 
 ENTRYPOINT ["/api"]

backend/Makefile

@@ -40,7 +40,7 @@ run4test:
 ## : run the api using `ENVIRONMENT=development TEST=true make run` or `make run4test` to avoid timeouts
 .PHONY: e2etest
 e2etest: $(E2ETEST_DEPS)
-	-cd ./e2etests/ && API_HOST="http://localhost:7000/" npm test
+	-cd ./e2etests/ && API_HOST="http://localhost:7001/" npm test
 	@make reset-postgres > /dev/null
 
 ## e2etest-compose: run end to end tests in the docker-compose.test.yaml
@@ -54,6 +54,7 @@ $(E2ETEST_DEPS):
 ## docker-e2etest: run e2etests in a docker compose
 docker-e2etest: $(E2ETEST_DEPS)
 	-rm -rf postgres-data
+	docker-compose -f docker-compose.test.yml down -v
 	docker-compose -f docker-compose.test.yml up --abort-on-container-exit --exit-code-from e2etests
 
 ## docker-build: build the api docker image
@@ -64,7 +65,7 @@ docker-build:
 ## docker-run: run the api docker container
 .PHONY: docker-run
 docker-run:
-	docker run -p 7000:7000 --env-file .docker-env jobsika
+	docker run -p 7001:7001 --env-file .docker-env jobsika
 
 .PHONY: install_goose
 install_goose:
@@ -100,7 +101,7 @@ start-api:
 
 ## stop-api: stops the api and its dependencies in a docker container
 stop-api:
-	docker-compose down && \
+	docker-compose down -v && \
 	rm -rf postgres-data
 
 ## start-postgres: starts postgres sql, setup and populate yotas database
@@ -145,12 +146,19 @@ swagger.yaml: check-swagger
 ## serve-swagger: open the api documentation
 .PHONY:serve-swagger
 serve-swagger: swagger.yaml check-swagger
-	swagger serve -F=swagger swagger.yaml
+	swagger serve -F=swagger swagger.yaml --no-open
+
+start-minio:
+	docker compose up start-minio
+	docker compose logs -f
+
+stop-minio:
+	docker compose down -v
 
 ## install-deps: install main dependencies
 install-deps:
 	@echo "installing golangci-lint..."
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.23.8
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.53.3 
 	@echo "golangci installed!"
 	@echo "installing errcheck..."
 	go install github.com/kisielk/errcheck@latest
@@ -165,7 +173,7 @@ install-deps:
 
 check-lint:
 ifeq (, $(shell which golangci-lint))
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.23.8
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.53.3
 endif
 ifeq (, $(shell which errcheck))
 	go install github.com/kisielk/errcheck@latest

backend/docker-compose.test.yml

@@ -13,9 +13,10 @@ services:
   api:
     depends_on:
       - postgres
+      - minio
     restart: always
     image: golang:buster
-    command: /api/scripts/wait-for-it/wait-for-it.sh postgres:5432 -t 120 -- /api/scripts/setup-postgres/setup-postgres-and-run-api.sh
+    command: /api/scripts/wait-for-it/wait-for-it.sh postgres:5432 -t 120 -- /api/scripts/setup-postgres/setup-minio-postgres-and-run-api.sh
     env_file:
       - ./.docker-env
     environment:
@@ -24,16 +25,30 @@ services:
     volumes:
       - .:/api
     ports:
-      - 7000:7000
+      - 7001:7001
     extra_hosts:
       - host.docker.internal:host-gateway
 
+  minio:
+    image: quay.io/minio/minio
+    command: server /data --console-address ":9090"
+    env_file:
+      - ./.docker-env
+    volumes:
+      - minio-storage:/data
+    ports:
+      - 9000:9000
+      - 9090:9090
+
   e2etests:
     depends_on:
       - api
     image: node:14-stretch
-    command: /api/scripts/wait-for-it/wait-for-it.sh api:7000 -t 300 -- make -C /api e2etest-compose
+    command: /api/scripts/wait-for-it/wait-for-it.sh api:7001 -t 300 -- make -C /api e2etest-compose
     environment:
-      API_HOST: "http://api:7000/"
+      API_HOST: "http://api:7001/"
     volumes:
       - .:/api
+
+volumes:
+  minio-storage: {}

backend/docker-compose.yml

@@ -24,16 +24,43 @@ services:
     volumes:
       - .:/api
 
+  minio:
+    image: quay.io/minio/minio
+    command: server /data --console-address ":9090"
+    env_file:
+      - ./.docker-env
+    volumes:
+      - minio-storage:/data
+    ports:
+      - 9000:9000
+      - 9090:9090
+
+  start-minio:
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    depends_on:
+      - minio
+    image: golang:buster
+    command: /api/scripts/wait-for-it/wait-for-it.sh minio:9000 -t 120 -- /api/scripts/setup-minio.sh
+    env_file:
+      - ./.docker-env
+    volumes:
+      - .:/api
+
   api:
     depends_on:
       - start-postgres
+      - start-minio
     image: golang:buster
-    command: ["/bin/bash", "-c", "cd /api/ && make run"]
+    command: [ "/bin/bash", "-c", "cd /api/ && make run" ]
     env_file:
       - ./.docker-env
       - ./.api-env
       - ./.opencollective-env
     volumes:
       - .:/api
     ports:
-      - 7000:7000
+      - 7001:7001
+
+volumes:
+  minio-storage: {}

backend/e2etests/.env.example

@@ -1 +1 @@
-API_HOST=http://localhost:7000/
+API_HOST=http://localhost:7001/