diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index 6b235f6b..00000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,66 +0,0 @@ -name: ci - -on: - push: - branches: master -jobs: - main: - runs-on: ubuntu-latest - continue-on-error: ${{ matrix.experimental }} - strategy: - fail-fast: false - matrix: - include: - - app: frontend - path: frontend - version: 0.8.3 - experimental: true - - app: backend - path: backend - version: 0.8.3 - experimental: false - - app: orborus - path: functions/onprem/orborus - version: 0.8.0 - experimental: false - - app: database - path: backend/database - version: 0.8.0 - experimental: false - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} -# Use below configuration for ghcr.io -# with: -# registry: ghcr.io -# username: ${{ github.repository_owner }} -# password: ${{ secrets.CR_PAT }} - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - env: - BUILDX_NO_DEFAULT_LOAD: true - with: - context: ${{ matrix.path }}/ - file: ${{ matrix.path }}/Dockerfile - platforms: linux/amd64,linux/arm64 - #,linux/386 - no node image I guess? - push: true - tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }} - - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 4b0b46c8..e4d03489 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -2,7 +2,7 @@ module main go 1.16 -replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared +//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch @@ -24,7 +24,7 @@ require ( github.com/h2non/filetype v1.1.3 github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da // indirect github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.2.53 + github.com/shuffle/shuffle-shared v0.2.66 go4.org v0.0.0-20201209231011-d4a079459e60 // indirect golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce google.golang.org/api v0.65.0 diff --git a/docker-compose.yml b/docker-compose.yml index 35a921e8..4ce779b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: depends_on: - backend backend: - #build: ./backend + build: ./backend image: ghcr.io/frikky/shuffle-backend:nightly container_name: shuffle-backend hostname: ${BACKEND_HOSTNAME} @@ -93,33 +93,33 @@ services: networks: - shuffle restart: unless-stopped - docker-socket-proxy: - image: tecnativa/docker-socket-proxy - container_name: shuffle-frontend - hostname: docker-socket-proxy - privileged: true - environment: - - SERVICES=1 - - TASKS=1 - - NETWORKS=1 - - NODES=1 - - BUILD=1 - - IMAGES=1 - - GRPC=1 - - CONTAINERS=1 - - PLUGINS=1 - - SYSTEM=1 - - VOLUMES=1 - - INFO=1 - - DISTRIBUTION=1 - - POST=1 - - AUTH=1 - - SECRETS=1 - - SWARM=1 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - networks: - - shuffle + #docker-socket-proxy: + # image: tecnativa/docker-socket-proxy + # container_name: shuffle-frontend + # hostname: docker-socket-proxy + # privileged: true + # environment: + # - SERVICES=1 + # - TASKS=1 + # - NETWORKS=1 + # - NODES=1 + # - BUILD=1 + # - IMAGES=1 + # - GRPC=1 + # - CONTAINERS=1 + # - PLUGINS=1 + # - SYSTEM=1 + # - VOLUMES=1 + # - INFO=1 + # - DISTRIBUTION=1 + # - POST=1 + # - AUTH=1 + # - SECRETS=1 + # - SWARM=1 + # volumes: + # - /var/run/docker.sock:/var/run/docker.sock + # networks: + # - shuffle networks: shuffle: driver: bridge diff --git a/frontend/src/views/Apps.jsx b/frontend/src/views/Apps.jsx index 542647ae..86728413 100644 --- a/frontend/src/views/Apps.jsx +++ b/frontend/src/views/Apps.jsx @@ -1456,7 +1456,7 @@ const Apps = (props) => { {isCloud ? null : ( - {props.userdata === undefined || props.userdata === null || props.userdata.role !== "admin" || isLoading ? null : ( + {userdata === undefined || userdata === null || isLoading ? null : ( { )} - {props.userdata === undefined || props.userdata === null || props.userdata.role !== "admin" ? null : + {userdata === undefined || userdata === null || userdata.role !== "admin" ? null :