mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-06 05:04:22 +00:00
Edit files
This commit is contained in:
parent
27c690ba87
commit
7bb4c31ea4
3 changed files with 62 additions and 24 deletions
26
.devcontainer/devcontainer-template.json
Normal file
26
.devcontainer/devcontainer-template.json
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
"id": "universal",
|
||||||
|
"version": "2.0.1",
|
||||||
|
"name": "Default Linux Universal",
|
||||||
|
"description": "Use or extend the new Ubuntu-based default, large, multi-language universal container for GitHub Codespaces.",
|
||||||
|
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/universal",
|
||||||
|
"publisher": "Dev Container Spec Maintainers",
|
||||||
|
"licenseURL": "https://github.com/devcontainers/templates/blob/main/LICENSE",
|
||||||
|
"platforms": [
|
||||||
|
"Python",
|
||||||
|
"Node.js",
|
||||||
|
"JavaScript",
|
||||||
|
"TypeScript",
|
||||||
|
"C++",
|
||||||
|
"Java",
|
||||||
|
"C#",
|
||||||
|
".NET Core",
|
||||||
|
"PHP",
|
||||||
|
"Go",
|
||||||
|
"Ruby",
|
||||||
|
"Conda"
|
||||||
|
],
|
||||||
|
"optionalPaths": [
|
||||||
|
".github/*"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
{
|
{
|
||||||
"image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",
|
"image": "mcr.microsoft.com/devcontainers/javascript-node:4-24-trixie",
|
||||||
"features": {
|
"features": {
|
||||||
"ghcr.io/devcontainers/features/docker-in-docker:2": {
|
|
||||||
"moby": "false"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"postCreateCommand": "npm install -g @devcontainers/cli",
|
"postCreateCommand": "npm install -g @devcontainers/cli",
|
||||||
"customizations": {
|
"customizations": {
|
||||||
|
|
@ -19,3 +17,23 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
"name": "Default Linux Universal",
|
||||||
|
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
|
||||||
|
"image": "mcr.microsoft.com/devcontainers/universal:6-linux"
|
||||||
|
|
||||||
|
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||||
|
// "features": {},
|
||||||
|
|
||||||
|
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||||
|
// "forwardPorts": [],
|
||||||
|
|
||||||
|
// Use 'postCreateCommand' to run commands after the container is created.
|
||||||
|
"postCreateCommand": "uname -a",
|
||||||
|
|
||||||
|
// Configure tool-specific properties.
|
||||||
|
// "customizations": {},
|
||||||
|
|
||||||
|
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
||||||
|
"remoteUser": "root"
|
||||||
|
}
|
||||||
|
|
|
||||||
36
.github/workflows/docker.yml
vendored
36
.github/workflows/docker.yml
vendored
|
|
@ -17,45 +17,41 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
submodules: true
|
submodules: true
|
||||||
- name: Docker meta
|
|
||||||
|
- name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v6
|
uses: docker/metadata-action@v6
|
||||||
env:
|
|
||||||
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
|
|
||||||
registry: "${{ env.CI_REGISTRY }}"
|
|
||||||
image: "${{ env.CI_IMAGE_NAME }}"
|
|
||||||
with:
|
with:
|
||||||
images: |
|
images: |
|
||||||
'$registry/$image'
|
reg.vados.ru/3x-ui
|
||||||
|
ghcr.io/vados-dev/3x-ui
|
||||||
tags: |
|
tags: |
|
||||||
# set latest tag for default branch
|
type=ref,event=branch
|
||||||
#type=raw,value=lts,enable={{is_default_branch}}
|
type=ref,event=tag
|
||||||
# use custom value instead of git tag
|
type=semver,pattern={{version}},value=lats,match=latest$
|
||||||
type=semver,pattern=v{{version}},value=v0.0.1
|
|
||||||
# use custom value and match part of it
|
|
||||||
type=semver,pattern=v{{version}},value=v0.0.1,match=v(\d.\d.\d)$
|
|
||||||
type=raw,event=tag
|
|
||||||
labels: |
|
labels: |
|
||||||
maintainer=${GITHUB_REPOSITORY_OWNER}
|
maintainer=${github.actor}
|
||||||
org.opencontainers.image.url=$registry/$image
|
org.opencontainers.image.url=https://{{steps.meta.outputs.images}}:{{steps.meta.outputs.tags}}
|
||||||
org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}}
|
org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}}
|
||||||
# type=semver,pattern={{version}}
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v4
|
uses: docker/setup-qemu-action@v4
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v4
|
||||||
|
with:
|
||||||
|
install: true
|
||||||
|
|
||||||
- name: Login to registry
|
- name: Login to registry
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
echo "reg_url=${{ env.CI_REGISTRY }}"
|
echo "reg_url=${CI_REGISTRY}"
|
||||||
echo "reg_user=${{ vars.REG_USER }}"
|
echo "reg_user=${{ vars.REG_USER }}"
|
||||||
echo "${{ secrets.REG_PASS }}" | docker login "${reg_url}" -u "${reg_user}" --password-stdin
|
echo "${{ secrets.REG_PASS }}" | docker login "${reg_url}" -u "${reg_user}" --password-stdin
|
||||||
|
|
||||||
|
|
@ -65,10 +61,8 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64
|
||||||
# images: ${{ steps.meta.outputs.images }}:${{ steps.meta.outputs.tags }}
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
# annotations: ${{ steps.meta.outputs.annotations }}
|
|
||||||
|
|
||||||
# uses: docker/login-action@v2
|
# uses: docker/login-action@v2
|
||||||
# with:
|
# with:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue