diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml index 91021d1..97c88bc 100644 --- a/.github/workflows/PullRequest.yml +++ b/.github/workflows/PullRequest.yml @@ -52,6 +52,7 @@ jobs: run: npm test Docker-Build: + needs: [Node] runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cd97fe..b9dd4f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,8 +70,7 @@ jobs: - name: checkout uses: actions/checkout@master - - name: Build and push - id: docker_build + - name: Bds Maneger Core Image uses: docker/build-push-action@v2 with: push: true @@ -79,28 +78,7 @@ jobs: tags: ghcr.io/the-bds-maneger/core:main platforms: ${{ env.DOCKER_ARCH }} - docker_base: - needs: [npm] - runs-on: ubuntu-latest - steps: - - 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: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: checkout - uses: actions/checkout@master - - - name: Build and push - id: docker_build + - name: Bds Maneger base Image uses: docker/build-push-action@v2 with: push: true diff --git a/package-lock.json b/package-lock.json index eac1ed6..251a760 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,9 +36,8 @@ "bds_telegram": "bin/telegram_bot.js" }, "devDependencies": { - "docker-run_build": "github:Sirherobrine23/Docker-Run_Build#main", + "docker-run_build": "*", "eslint": "^7.19.0", - "husky": "^7.0.0", "nexe": "*", "nodemon": "^2.0.12" }, @@ -2123,11 +2122,10 @@ } }, "node_modules/docker-run_build": { - "version": "1.1.2", - "resolved": "git+ssh://git@github.com/Sirherobrine23/Docker-Run_Build.git#6f287b5a3b3fdecd7758a93d06ce9e565bf7cd70", - "integrity": "sha512-hxpY7IzAlclvQilABv5FJQdXoKNfkVnydxUGjQte1khvb8/ckvzHKetNPf03NJK+rCKQhq7mKqbXWGr9sNg/LA==", + "version": "12.731.614", + "resolved": "https://registry.npmjs.org/docker-run_build/-/docker-run_build-12.731.614.tgz", + "integrity": "sha512-J9A2BictoxCsakeTWTjVYkNyRQouARO5ZXRYj0OaEpjKfWrzKh3/9Cg1LylzdlnuhZb4M2C9A+nD5er62AZgrg==", "dev": true, - "license": "GPL-3.0-or-later", "dependencies": { "js-yaml": "^4.1.0", "minimist": "^1.2.5" @@ -3744,21 +3742,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/husky": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", - "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", - "dev": true, - "bin": { - "husky": "lib/bin.js" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/typicode" - } - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -9946,10 +9929,10 @@ } }, "docker-run_build": { - "version": "git+ssh://git@github.com/Sirherobrine23/Docker-Run_Build.git#6f287b5a3b3fdecd7758a93d06ce9e565bf7cd70", - "integrity": "sha512-hxpY7IzAlclvQilABv5FJQdXoKNfkVnydxUGjQte1khvb8/ckvzHKetNPf03NJK+rCKQhq7mKqbXWGr9sNg/LA==", + "version": "12.731.614", + "resolved": "https://registry.npmjs.org/docker-run_build/-/docker-run_build-12.731.614.tgz", + "integrity": "sha512-J9A2BictoxCsakeTWTjVYkNyRQouARO5ZXRYj0OaEpjKfWrzKh3/9Cg1LylzdlnuhZb4M2C9A+nD5er62AZgrg==", "dev": true, - "from": "docker-run_build@github:Sirherobrine23/Docker-Run_Build#main", "requires": { "js-yaml": "^4.1.0", "minimist": "^1.2.5" @@ -11243,12 +11226,6 @@ } } }, - "husky": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", - "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", - "dev": true - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", diff --git a/package.json b/package.json index 6073377..45c34a7 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,6 @@ "node": ">=14", "npm": ">=7" }, - "husky": { - "hooks": { - "post-merge": "npm install --node-save -d" - } - }, "dependencies": { "@azure/storage-blob": "^12.6.0", "adm-zip": "^0.5.1", @@ -76,9 +71,8 @@ "uuid": "^8.3.2" }, "devDependencies": { - "docker-run_build": "github:Sirherobrine23/Docker-Run_Build#main", + "docker-run_build": "*", "eslint": "^7.19.0", - "husky": "^7.0.0", "nexe": "*", "nodemon": "^2.0.12" }