From aa63b8ef671c0c4ef1fb18d3c838f4451dcffcd0 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 17 Jun 2020 08:21:19 +0200 Subject: [PATCH 001/304] Bootstrap Gitea repository --- .envrc.sample | 14 +++++++++ .gitignore | 1 + README.md | 3 ++ app.ini.tmpl | 28 +++++++++++++++++ compose.yml | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ helpers.sh | 22 ++++++++++++++ 6 files changed, 151 insertions(+) create mode 100644 .envrc.sample create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app.ini.tmpl create mode 100644 compose.yml create mode 100755 helpers.sh diff --git a/.envrc.sample b/.envrc.sample new file mode 100644 index 0000000..aaaf079 --- /dev/null +++ b/.envrc.sample @@ -0,0 +1,14 @@ +export APP_INI_VERSION=v1 +export APP_NAME=gitea +export DB_HOST=postgres:5432 +export DB_NAME=gitea +export DB_PASSWD_VERSION=v1 +export DB_TYPE=postgres +export DB_USER=gitea +export DOMAIN=gitea.swarm.autonomic.zone +export INTERNAL_TOKEN_VERSION=v1 +export JWT_SECRET_VERSION=v1 +export LETS_ENCRYPT_ENV=staging +export SECRET_KEY_VERSION=v1 +export SSH_HOST_PORT=2222 +export STACK_NAME=gitea diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a6353d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.envrc diff --git a/README.md b/README.md new file mode 100644 index 0000000..00326e0 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# gitea + +> https://gitea.io diff --git a/app.ini.tmpl b/app.ini.tmpl new file mode 100644 index 0000000..10c58e7 --- /dev/null +++ b/app.ini.tmpl @@ -0,0 +1,28 @@ +APP_NAME = {{ env "GITEA_APP_NAME" }} +RUN_MODE = prod + +[database] +DB_TYPE = {{ env "GITEA_DB_TYPE" }} +HOST = {{ env "GITEA_DB_HOST" }} +NAME = {{ env "GITEA_DB_NAME" }} +PASSWD = {{ secret "db_passwd" }} +USER = {{ env "GITEA_DB_USER" }} + +[indexer] +STARTUP_TIMEOUT = 0 + +[server] +DOMAIN = {{ env "GITEA_DOMAIN" }} +ROOT_URL = https://%(DOMAIN)s/ +SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} +SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} +SSH_PORT = {{ env "GITEA_SSH_PORT" }} +START_SSH_SERVER = true + +[security] +INSTALL_LOCK = true +INTERNAL_TOKEN = {{ secret "internal_token" }} +SECRET_KEY = {{ secret "secret_key" }} + +[oauth2] +JWT_SECRET = {{ secret "jwt_secret" }} diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..92d7357 --- /dev/null +++ b/compose.yml @@ -0,0 +1,83 @@ +--- +version: "3.8" + +services: + gitea: + image: "gitea/gitea:1.11.5" + configs: + - source: app_ini + target: /data/gitea/conf/app.ini + secrets: + - db_passwd + - internal_token + - jwt_secret + - secret_key + environment: + - GITEA_APP_NAME=${APP_NAME} + - GITEA_DB_HOST=${DB_HOST} + - GITEA_DB_NAME=${DB_NAME} + - GITEA_DB_TYPE=${DB_TYPE} + - GITEA_DB_USER=${DB_USER} + - GITEA_DOMAIN=${DOMAIN} + - GITEA_SSH_PORT=${SSH_HOST_PORT} + volumes: + - "git:/data" + networks: + - proxy + - internal + deploy: + update_config: + failure_action: rollback + labels: + - "traefik.enable=true" + + - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.gitea.entrypoints=web-secure" + - "traefik.http.services.gitea.loadbalancer.server.port=3000" + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" + + - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" + - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" + + postgres: + image: "postgres:12" + secrets: + - db_passwd + environment: + - POSTGRES_USER=gitea + - POSTGRES_DB=gitea + - POSTGRES_PASSWORD_FILE=/run/secrets/db_passwd + networks: + - internal + volumes: + - "db:/var/lib/postgresql/data" + +networks: + internal: + proxy: + external: true + +configs: + app_ini: + name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} + file: app.ini.tmpl + template_driver: golang + +secrets: + db_passwd: + name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + external: true + internal_token: + name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + external: true + jwt_secret: + name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + external: true + secret_key: + name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + external: true + +volumes: + git: + db: diff --git a/helpers.sh b/helpers.sh new file mode 100755 index 0000000..3ccda81 --- /dev/null +++ b/helpers.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +create-secrets () { + pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - + pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - + pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - + pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - +} + +create-admin () { + container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) + docker exec "$container" \ + gitea \ + --custom-path /data/gitea/ \ + --config /data/gitea/conf/app.ini \ + admin \ + create-user \ + --admin \ + --username autonomic \ + --password autonomic \ + --email autonomic@autonomic.zone +} -- 2.47.2 From eb460a957f7ec53ccf85633107fdb40e19f7290b Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 17 Jun 2020 08:21:19 +0200 Subject: [PATCH 002/304] Bootstrap Gitea repository --- .envrc.sample | 14 +++++++++ .gitignore | 1 + README.md | 3 ++ app.ini.tmpl | 28 +++++++++++++++++ compose.yml | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ helpers.sh | 22 ++++++++++++++ 6 files changed, 151 insertions(+) create mode 100644 .envrc.sample create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app.ini.tmpl create mode 100644 compose.yml create mode 100755 helpers.sh diff --git a/.envrc.sample b/.envrc.sample new file mode 100644 index 0000000..aaaf079 --- /dev/null +++ b/.envrc.sample @@ -0,0 +1,14 @@ +export APP_INI_VERSION=v1 +export APP_NAME=gitea +export DB_HOST=postgres:5432 +export DB_NAME=gitea +export DB_PASSWD_VERSION=v1 +export DB_TYPE=postgres +export DB_USER=gitea +export DOMAIN=gitea.swarm.autonomic.zone +export INTERNAL_TOKEN_VERSION=v1 +export JWT_SECRET_VERSION=v1 +export LETS_ENCRYPT_ENV=staging +export SECRET_KEY_VERSION=v1 +export SSH_HOST_PORT=2222 +export STACK_NAME=gitea diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a6353d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.envrc diff --git a/README.md b/README.md new file mode 100644 index 0000000..00326e0 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# gitea + +> https://gitea.io diff --git a/app.ini.tmpl b/app.ini.tmpl new file mode 100644 index 0000000..10c58e7 --- /dev/null +++ b/app.ini.tmpl @@ -0,0 +1,28 @@ +APP_NAME = {{ env "GITEA_APP_NAME" }} +RUN_MODE = prod + +[database] +DB_TYPE = {{ env "GITEA_DB_TYPE" }} +HOST = {{ env "GITEA_DB_HOST" }} +NAME = {{ env "GITEA_DB_NAME" }} +PASSWD = {{ secret "db_passwd" }} +USER = {{ env "GITEA_DB_USER" }} + +[indexer] +STARTUP_TIMEOUT = 0 + +[server] +DOMAIN = {{ env "GITEA_DOMAIN" }} +ROOT_URL = https://%(DOMAIN)s/ +SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} +SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} +SSH_PORT = {{ env "GITEA_SSH_PORT" }} +START_SSH_SERVER = true + +[security] +INSTALL_LOCK = true +INTERNAL_TOKEN = {{ secret "internal_token" }} +SECRET_KEY = {{ secret "secret_key" }} + +[oauth2] +JWT_SECRET = {{ secret "jwt_secret" }} diff --git a/compose.yml b/compose.yml new file mode 100644 index 0000000..92d7357 --- /dev/null +++ b/compose.yml @@ -0,0 +1,83 @@ +--- +version: "3.8" + +services: + gitea: + image: "gitea/gitea:1.11.5" + configs: + - source: app_ini + target: /data/gitea/conf/app.ini + secrets: + - db_passwd + - internal_token + - jwt_secret + - secret_key + environment: + - GITEA_APP_NAME=${APP_NAME} + - GITEA_DB_HOST=${DB_HOST} + - GITEA_DB_NAME=${DB_NAME} + - GITEA_DB_TYPE=${DB_TYPE} + - GITEA_DB_USER=${DB_USER} + - GITEA_DOMAIN=${DOMAIN} + - GITEA_SSH_PORT=${SSH_HOST_PORT} + volumes: + - "git:/data" + networks: + - proxy + - internal + deploy: + update_config: + failure_action: rollback + labels: + - "traefik.enable=true" + + - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.gitea.entrypoints=web-secure" + - "traefik.http.services.gitea.loadbalancer.server.port=3000" + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" + + - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" + - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" + + postgres: + image: "postgres:12" + secrets: + - db_passwd + environment: + - POSTGRES_USER=gitea + - POSTGRES_DB=gitea + - POSTGRES_PASSWORD_FILE=/run/secrets/db_passwd + networks: + - internal + volumes: + - "db:/var/lib/postgresql/data" + +networks: + internal: + proxy: + external: true + +configs: + app_ini: + name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} + file: app.ini.tmpl + template_driver: golang + +secrets: + db_passwd: + name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + external: true + internal_token: + name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + external: true + jwt_secret: + name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + external: true + secret_key: + name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + external: true + +volumes: + git: + db: diff --git a/helpers.sh b/helpers.sh new file mode 100755 index 0000000..3ccda81 --- /dev/null +++ b/helpers.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +create-secrets () { + pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - + pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - + pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - + pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - +} + +create-admin () { + container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) + docker exec "$container" \ + gitea \ + --custom-path /data/gitea/ \ + --config /data/gitea/conf/app.ini \ + admin \ + create-user \ + --admin \ + --username autonomic \ + --password autonomic \ + --email autonomic@autonomic.zone +} -- 2.47.2 From fbf0aa00a459372fb3b9ebf231a4d079e2086c69 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 17 Jun 2020 08:30:59 +0200 Subject: [PATCH 003/304] Add LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- 2.47.2 From 39972bb9ebb3dd7b1a74bf87f51512a6995f0e72 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 17 Jun 2020 08:30:59 +0200 Subject: [PATCH 004/304] Add LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. -- 2.47.2 From 7f661b1074d9b43c98151ace75ce054d41fb454c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 22 Jun 2020 19:41:06 +0200 Subject: [PATCH 005/304] Zero downtime configuration --- compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compose.yml b/compose.yml index 92d7357..9ced3e7 100644 --- a/compose.yml +++ b/compose.yml @@ -25,9 +25,16 @@ services: networks: - proxy - internal + healthcheck: + test: ["CMD", "curl", "-f" "http://localhost:3000"] + interval: 15s + timeout: 10s + retries: 10 + start_period: 30s deploy: update_config: failure_action: rollback + order: start-first labels: - "traefik.enable=true" -- 2.47.2 From 8ada7f238c3938833ec0caa614562f7377291856 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 22 Jun 2020 19:41:06 +0200 Subject: [PATCH 006/304] Zero downtime configuration --- compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compose.yml b/compose.yml index 92d7357..9ced3e7 100644 --- a/compose.yml +++ b/compose.yml @@ -25,9 +25,16 @@ services: networks: - proxy - internal + healthcheck: + test: ["CMD", "curl", "-f" "http://localhost:3000"] + interval: 15s + timeout: 10s + retries: 10 + start_period: 30s deploy: update_config: failure_action: rollback + order: start-first labels: - "traefik.enable=true" -- 2.47.2 From 2f234ff5d4d2b077b4fb9aae624ca9550bd8294d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 23 Jun 2020 11:10:33 +0200 Subject: [PATCH 007/304] Use mysql to match our installation --- .envrc.sample | 6 +++--- compose.yml | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index aaaf079..09173d6 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,14 +1,14 @@ export APP_INI_VERSION=v1 export APP_NAME=gitea -export DB_HOST=postgres:5432 +export DB_HOST=mariadb:3306 export DB_NAME=gitea export DB_PASSWD_VERSION=v1 -export DB_TYPE=postgres +export DB_TYPE=mysql export DB_USER=gitea export DOMAIN=gitea.swarm.autonomic.zone export INTERNAL_TOKEN_VERSION=v1 export JWT_SECRET_VERSION=v1 -export LETS_ENCRYPT_ENV=staging +export LETS_ENCRYPT_ENV=production export SECRET_KEY_VERSION=v1 export SSH_HOST_PORT=2222 export STACK_NAME=gitea diff --git a/compose.yml b/compose.yml index 9ced3e7..9dbc303 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.11.5" + image: "gitea/gitea:1.12.1" configs: - source: app_ini target: /data/gitea/conf/app.ini @@ -47,18 +47,20 @@ services: - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" - postgres: - image: "postgres:12" + mariadb: + image: "mariadb:10.5" + environment: + - MYSQL_DATABASE=gitea + - MYSQL_USER=gitea + - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd secrets: - db_passwd - environment: - - POSTGRES_USER=gitea - - POSTGRES_DB=gitea - - POSTGRES_PASSWORD_FILE=/run/secrets/db_passwd + - db_root_passwd + volumes: + - "mariadb:/var/lib/mysql" networks: - internal - volumes: - - "db:/var/lib/postgresql/data" networks: internal: @@ -87,4 +89,4 @@ secrets: volumes: git: - db: + mariadb: -- 2.47.2 From 875a0efa1e3dc70a11d1a12b7f38b29b6c0314f4 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 23 Jun 2020 11:10:33 +0200 Subject: [PATCH 008/304] Use mysql to match our installation --- .envrc.sample | 6 +++--- compose.yml | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index aaaf079..09173d6 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,14 +1,14 @@ export APP_INI_VERSION=v1 export APP_NAME=gitea -export DB_HOST=postgres:5432 +export DB_HOST=mariadb:3306 export DB_NAME=gitea export DB_PASSWD_VERSION=v1 -export DB_TYPE=postgres +export DB_TYPE=mysql export DB_USER=gitea export DOMAIN=gitea.swarm.autonomic.zone export INTERNAL_TOKEN_VERSION=v1 export JWT_SECRET_VERSION=v1 -export LETS_ENCRYPT_ENV=staging +export LETS_ENCRYPT_ENV=production export SECRET_KEY_VERSION=v1 export SSH_HOST_PORT=2222 export STACK_NAME=gitea diff --git a/compose.yml b/compose.yml index 9ced3e7..9dbc303 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.11.5" + image: "gitea/gitea:1.12.1" configs: - source: app_ini target: /data/gitea/conf/app.ini @@ -47,18 +47,20 @@ services: - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" - postgres: - image: "postgres:12" + mariadb: + image: "mariadb:10.5" + environment: + - MYSQL_DATABASE=gitea + - MYSQL_USER=gitea + - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd secrets: - db_passwd - environment: - - POSTGRES_USER=gitea - - POSTGRES_DB=gitea - - POSTGRES_PASSWORD_FILE=/run/secrets/db_passwd + - db_root_passwd + volumes: + - "mariadb:/var/lib/mysql" networks: - internal - volumes: - - "db:/var/lib/postgresql/data" networks: internal: @@ -87,4 +89,4 @@ secrets: volumes: git: - db: + mariadb: -- 2.47.2 From 13a1da8760123174ac8148f4dd889310799e835f Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 23 Jun 2020 11:39:51 +0200 Subject: [PATCH 009/304] Don't forget the root password --- compose.yml | 3 +++ helpers.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/compose.yml b/compose.yml index 9dbc303..a406751 100644 --- a/compose.yml +++ b/compose.yml @@ -77,6 +77,9 @@ secrets: db_passwd: name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} external: true + db_root_passwd: + name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION} + external: true internal_token: name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} external: true diff --git a/helpers.sh b/helpers.sh index 3ccda81..0e529d6 100755 --- a/helpers.sh +++ b/helpers.sh @@ -2,6 +2,7 @@ create-secrets () { pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - + pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" - pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - -- 2.47.2 From dfab83929d2c0a809375b9f871498790c8d19b68 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 23 Jun 2020 11:39:51 +0200 Subject: [PATCH 010/304] Don't forget the root password --- compose.yml | 3 +++ helpers.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/compose.yml b/compose.yml index 9dbc303..a406751 100644 --- a/compose.yml +++ b/compose.yml @@ -77,6 +77,9 @@ secrets: db_passwd: name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} external: true + db_root_passwd: + name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION} + external: true internal_token: name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} external: true diff --git a/helpers.sh b/helpers.sh index 3ccda81..0e529d6 100755 --- a/helpers.sh +++ b/helpers.sh @@ -2,6 +2,7 @@ create-secrets () { pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - + pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" - pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - -- 2.47.2 From ae1b1c29324134682ab863890cd34d9e74df3983 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 1 Jul 2020 10:00:29 +0200 Subject: [PATCH 011/304] Fix typo --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index a406751..6575669 100644 --- a/compose.yml +++ b/compose.yml @@ -26,7 +26,7 @@ services: - proxy - internal healthcheck: - test: ["CMD", "curl", "-f" "http://localhost:3000"] + test: ["CMD", "curl", "-f", "http://localhost:3000"] interval: 15s timeout: 10s retries: 10 -- 2.47.2 From 248f8e2b8d3952b944780a383de5308c878343f5 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 1 Jul 2020 10:00:29 +0200 Subject: [PATCH 012/304] Fix typo --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index a406751..6575669 100644 --- a/compose.yml +++ b/compose.yml @@ -26,7 +26,7 @@ services: - proxy - internal healthcheck: - test: ["CMD", "curl", "-f" "http://localhost:3000"] + test: ["CMD", "curl", "-f", "http://localhost:3000"] interval: 15s timeout: 10s retries: 10 -- 2.47.2 From 1a25c0b2ed8c45fe28e9d7b2885c68c1c55f46db Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:01:02 +0200 Subject: [PATCH 013/304] Use new version naming convention --- compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index 6575669..d6a74c8 100644 --- a/compose.yml +++ b/compose.yml @@ -69,25 +69,25 @@ networks: configs: app_ini: - name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} + name: ${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang secrets: db_passwd: - name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + Aname: ${DB_PASSWD_VERSION} external: true db_root_passwd: - name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION} + name: ${DB_ROOT_PASSWD_VERSION} external: true internal_token: - name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + name: ${INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + name: ${JWT_SECRET_VERSION} external: true secret_key: - name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + name: ${SECRET_KEY_VERSION} external: true volumes: -- 2.47.2 From 929265585264cfea0c40ca2c5e00e9efa2255a09 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:01:02 +0200 Subject: [PATCH 014/304] Use new version naming convention --- compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index 6575669..d6a74c8 100644 --- a/compose.yml +++ b/compose.yml @@ -69,25 +69,25 @@ networks: configs: app_ini: - name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} + name: ${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang secrets: db_passwd: - name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + Aname: ${DB_PASSWD_VERSION} external: true db_root_passwd: - name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION} + name: ${DB_ROOT_PASSWD_VERSION} external: true internal_token: - name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + name: ${INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + name: ${JWT_SECRET_VERSION} external: true secret_key: - name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + name: ${SECRET_KEY_VERSION} external: true volumes: -- 2.47.2 From c877b880b8386c68257fb086f87b5be3e20db7ff Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:07:14 +0200 Subject: [PATCH 015/304] Fix typo --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d6a74c8..d5acaf1 100644 --- a/compose.yml +++ b/compose.yml @@ -75,7 +75,7 @@ configs: secrets: db_passwd: - Aname: ${DB_PASSWD_VERSION} + name: ${DB_PASSWD_VERSION} external: true db_root_passwd: name: ${DB_ROOT_PASSWD_VERSION} -- 2.47.2 From 31c6e15b962bdce1c2fb7c05284c9bc709e786e6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:07:14 +0200 Subject: [PATCH 016/304] Fix typo --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d6a74c8..d5acaf1 100644 --- a/compose.yml +++ b/compose.yml @@ -75,7 +75,7 @@ configs: secrets: db_passwd: - Aname: ${DB_PASSWD_VERSION} + name: ${DB_PASSWD_VERSION} external: true db_root_passwd: name: ${DB_ROOT_PASSWD_VERSION} -- 2.47.2 From a226cfb0be2a1f145f2fe9371291c5eafdb4b9ec Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:47:50 +0200 Subject: [PATCH 017/304] Also load SSH port from env --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d5acaf1..33db8dd 100644 --- a/compose.yml +++ b/compose.yml @@ -45,7 +45,7 @@ services: - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${SSH_HOST_PORT}" mariadb: image: "mariadb:10.5" -- 2.47.2 From 344fcfe192c38060162fd92e6659bf3903dfce2c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 2 Jul 2020 14:47:50 +0200 Subject: [PATCH 018/304] Also load SSH port from env --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index d5acaf1..33db8dd 100644 --- a/compose.yml +++ b/compose.yml @@ -45,7 +45,7 @@ services: - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${SSH_HOST_PORT}" mariadb: image: "mariadb:10.5" -- 2.47.2 From 8947e3a528f4deea685a97b2ee6a989e2182a0ed Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 5 Jul 2020 02:34:56 +0200 Subject: [PATCH 019/304] Add default, shorten start check and remove outdated cruft --- compose.yml | 4 ++-- helpers.sh | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/compose.yml b/compose.yml index 33db8dd..9198f19 100644 --- a/compose.yml +++ b/compose.yml @@ -30,7 +30,7 @@ services: interval: 15s timeout: 10s retries: 10 - start_period: 30s + start_period: 15s deploy: update_config: failure_action: rollback @@ -41,7 +41,7 @@ services: - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.gitea.entrypoints=web-secure" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}" - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" diff --git a/helpers.sh b/helpers.sh index 0e529d6..72f75d4 100755 --- a/helpers.sh +++ b/helpers.sh @@ -1,13 +1,5 @@ #!/bin/bash -create-secrets () { - pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - - pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" - - pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - - pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - - pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - -} - create-admin () { container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) docker exec "$container" \ -- 2.47.2 From 82023bf3a826a6f996ac23055c9b2889303e8115 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 5 Jul 2020 02:34:56 +0200 Subject: [PATCH 020/304] Add default, shorten start check and remove outdated cruft --- compose.yml | 4 ++-- helpers.sh | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/compose.yml b/compose.yml index 33db8dd..9198f19 100644 --- a/compose.yml +++ b/compose.yml @@ -30,7 +30,7 @@ services: interval: 15s timeout: 10s retries: 10 - start_period: 30s + start_period: 15s deploy: update_config: failure_action: rollback @@ -41,7 +41,7 @@ services: - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.gitea.entrypoints=web-secure" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}" - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" diff --git a/helpers.sh b/helpers.sh index 0e529d6..72f75d4 100755 --- a/helpers.sh +++ b/helpers.sh @@ -1,13 +1,5 @@ #!/bin/bash -create-secrets () { - pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" - - pwgen -n 32 1 | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" - - pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" - - pwgen -n 43 1 | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" - - pwgen -n 64 1 | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" - -} - create-admin () { container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) docker exec "$container" \ -- 2.47.2 From f5dd213348ae7f5b02699e76d81e1d2adf8ef598 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 07:18:28 +0200 Subject: [PATCH 021/304] Use correct collation/charset See https://git.autonomic.zone/autonomic-cooperative/git.autonomic.zone/issues/13#issuecomment-868. --- compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose.yml b/compose.yml index 9198f19..1f0f282 100644 --- a/compose.yml +++ b/compose.yml @@ -49,6 +49,8 @@ services: mariadb: image: "mariadb:10.5" + command: | + mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: - MYSQL_DATABASE=gitea - MYSQL_USER=gitea -- 2.47.2 From e310cb73c691dc57c8d5894885f107f84aeec97d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 07:18:28 +0200 Subject: [PATCH 022/304] Use correct collation/charset See https://git.autonomic.zone/autonomic-cooperative/git.autonomic.zone/issues/13#issuecomment-868. --- compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose.yml b/compose.yml index 9198f19..1f0f282 100644 --- a/compose.yml +++ b/compose.yml @@ -49,6 +49,8 @@ services: mariadb: image: "mariadb:10.5" + command: | + mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: - MYSQL_DATABASE=gitea - MYSQL_USER=gitea -- 2.47.2 From 80ebbf0d4c186fe2bfb9c71dc1a6bd2ba9fa3bee Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:05:33 +0200 Subject: [PATCH 023/304] Add avatar storage path See https://git.autonomic.zone/autonomic-cooperative/git.autonomic.zone/issues/12. --- app.ini.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 10c58e7..bb4a7de 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -26,3 +26,7 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} + +[picture] +AVATAR_UPLOAD_PATH = /data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = /data/repo-avatars -- 2.47.2 From ef05bea35c09e56f880598bd8a4a7b17da782c2b Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:05:33 +0200 Subject: [PATCH 024/304] Add avatar storage path See https://git.autonomic.zone/autonomic-cooperative/git.autonomic.zone/issues/12. --- app.ini.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 10c58e7..bb4a7de 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -26,3 +26,7 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} + +[picture] +AVATAR_UPLOAD_PATH = /data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = /data/repo-avatars -- 2.47.2 From 4bfaf56cef26cc0ccdf7af3bdce5524d298a3c78 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:17:43 +0200 Subject: [PATCH 025/304] Use more consistent paths for storage --- app.ini.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index bb4a7de..0294c3b 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -28,5 +28,5 @@ SECRET_KEY = {{ secret "secret_key" }} JWT_SECRET = {{ secret "jwt_secret" }} [picture] -AVATAR_UPLOAD_PATH = /data/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/repo-avatars +AVATAR_UPLOAD_PATH = /data/gitea/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars -- 2.47.2 From 2321b2fab73f04543d5a854ea6111f8368d8cdec Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:17:43 +0200 Subject: [PATCH 026/304] Use more consistent paths for storage --- app.ini.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index bb4a7de..0294c3b 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -28,5 +28,5 @@ SECRET_KEY = {{ secret "secret_key" }} JWT_SECRET = {{ secret "jwt_secret" }} [picture] -AVATAR_UPLOAD_PATH = /data/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/repo-avatars +AVATAR_UPLOAD_PATH = /data/gitea/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars -- 2.47.2 From 8758e90b93a6f430ea92fea74f5f142dcc53dcd6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:25:42 +0200 Subject: [PATCH 027/304] Use main now --- app.ini.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 0294c3b..049a1e9 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -8,6 +8,9 @@ NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_passwd" }} USER = {{ env "GITEA_DB_USER" }} +[repository] +DEFAULT_BRANCH = main + [indexer] STARTUP_TIMEOUT = 0 -- 2.47.2 From 8be911205d8f5031e62e3bdf976d1c508a4cde12 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:25:42 +0200 Subject: [PATCH 028/304] Use main now --- app.ini.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 0294c3b..049a1e9 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -8,6 +8,9 @@ NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_passwd" }} USER = {{ env "GITEA_DB_USER" }} +[repository] +DEFAULT_BRANCH = main + [indexer] STARTUP_TIMEOUT = 0 -- 2.47.2 From bf1f9c515a159a7613aa3fd20e7925bd3bae5c19 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:31:34 +0200 Subject: [PATCH 029/304] Set attachments and default path --- app.ini.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 049a1e9..c6d494c 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -15,6 +15,7 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] +APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} @@ -33,3 +34,6 @@ JWT_SECRET = {{ secret "jwt_secret" }} [picture] AVATAR_UPLOAD_PATH = /data/gitea/avatars REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars + +[attachment] +PATH = /data/gitea/attachments -- 2.47.2 From 91df7492ae153e73bcc0ce01b0147b99f8a165ca Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 9 Sep 2020 08:31:34 +0200 Subject: [PATCH 030/304] Set attachments and default path --- app.ini.tmpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 049a1e9..c6d494c 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -15,6 +15,7 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] +APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} @@ -33,3 +34,6 @@ JWT_SECRET = {{ secret "jwt_secret" }} [picture] AVATAR_UPLOAD_PATH = /data/gitea/avatars REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars + +[attachment] +PATH = /data/gitea/attachments -- 2.47.2 From 674ff893e30fe5db116cca6472beb439c6412d7c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Sep 2020 20:01:52 +0000 Subject: [PATCH 031/304] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..39a2b6e --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} -- 2.47.2 From c92c72bb77fbca8fb533acfc13ce5eac7305adcc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 14 Sep 2020 20:01:52 +0000 Subject: [PATCH 032/304] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..39a2b6e --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:base" + ] +} -- 2.47.2 From ad0f76e57634704ac8c583d1a71a579031bd08dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 16 Sep 2020 07:01:38 +0000 Subject: [PATCH 033/304] Update gitea/gitea Docker tag to v1.12.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 1f0f282..2e88054 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.12.1" + image: "gitea/gitea:1.12.4" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From db43d853cd7b73a84cb64d38b9c7986e84844754 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 16 Sep 2020 07:01:38 +0000 Subject: [PATCH 034/304] Update gitea/gitea Docker tag to v1.12.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 1f0f282..2e88054 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.12.1" + image: "gitea/gitea:1.12.4" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From e91ebf527fcb2d862173e412e4e5d3d7a4376ac1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Oct 2020 07:01:38 +0000 Subject: [PATCH 035/304] Update gitea/gitea Docker tag to v1.12.5 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 2e88054..4049d3b 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.12.4" + image: "gitea/gitea:1.12.5" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 47214235f2c988605b24a3b9ebf3a665b8493463 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Oct 2020 07:01:38 +0000 Subject: [PATCH 036/304] Update gitea/gitea Docker tag to v1.12.5 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 2e88054..4049d3b 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: gitea: - image: "gitea/gitea:1.12.4" + image: "gitea/gitea:1.12.5" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 0b853246fcb027313a6ba6ef5c22f75ab6e31f91 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:25:48 +0100 Subject: [PATCH 037/304] Migrating from git.autonomic.zone repo --- .drone.yml | 37 +++++++++++++++++++++++++++++++++++++ README.md | 2 +- app.ini.tmpl | 28 ++++++++++++++++++++++++++++ compose.yml | 51 ++++++++++++++++++++++++++++++++------------------- helpers.sh | 15 --------------- 5 files changed, 98 insertions(+), 35 deletions(-) create mode 100644 .drone.yml delete mode 100755 helpers.sh diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..c6119b5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,37 @@ +--- +kind: pipeline +name: deploy to swarm-test.autonomic.zone +steps: + - name: deployment + image: decentral1se/stack-ssh-deploy:latest + settings: + host: swarm-test.autonomic.zone + stack: gitea + deploy_key: + from_secret: drone_ssh_swarm_test + environment: + DOMAIN: gitea.swarm-test.autonomic.zone + STACK_NAME: gitea + LETS_ENCRYPT_ENV: production + GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true + GITEA_APP_NAME: Git with solidaritea + GITEA_AUTO_WATCH_NEW_REPOS: false + GITEA_DISABLE_REGISTRATION: false + GITEA_DOMAIN:gitea.swarm-test.autonomic.zone + GITEA_ENABLE_NOTIFY_MAIL: false + GITEA_ENABLE_OPENID_SIGNIN: true + GITEA_ENABLE_OPENID_SIGNUP: true + GITEA_MAILER_FROM: foo@example.com + GITEA_MAILER_HOST: smtp.example.com + GITEA_MAILER_USER: foo@example.com + GITEA_SSH_PORT: 2222 + APP_INI_VERSION: v1 + DB_PASSWD_VERSION: v1 + DB_ROOT_PASSWD_VERSION: v1 + INTERNAL_TOKEN_VERSION: v1 + JWT_SECRET_VERSION: v1 + SECRET_KEY_VERSION: v1 + SMTP_PASSWD_VERSION: v1 +trigger: + branch: + - master diff --git a/README.md b/README.md index 00326e0..2e516f1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # gitea -> https://gitea.io +[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) diff --git a/app.ini.tmpl b/app.ini.tmpl index c6d494c..4a779b1 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -1,13 +1,25 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} RUN_MODE = prod +RUN_USER = git [database] +CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_passwd" }} USER = {{ env "GITEA_DB_USER" }} +[service] +ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }} +AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} +DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }} +ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }} + +[openid] +ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }} +ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }} + [repository] DEFAULT_BRANCH = main @@ -17,6 +29,7 @@ STARTUP_TIMEOUT = 0 [server] APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} +LANDING_PAGE = organizations ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} @@ -31,6 +44,21 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} +[mailer] +ENABLED = true +FROM = {{ env "GITEA_MAILER_FROM" }} +HOST = {{ env "GITEA_MAILER_HOST" }} +USER = {{ env "GITEA_MAILER_USER" }} +PASSWD = {{ secret "smtp_passwd" }} +MAILER_TYPE = smtp +IS_TLS_ENABLED = true + +[markup.restructuredtext] +ENABLED = true +FILE_EXTENSIONS = .rst +RENDER_COMMAND = rst2html +IS_INPUT_FILE = false + [picture] AVATAR_UPLOAD_PATH = /data/gitea/avatars REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars diff --git a/compose.yml b/compose.yml index 4049d3b..8866ff5 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: - gitea: + app: image: "gitea/gitea:1.12.5" configs: - source: app_ini @@ -12,16 +12,28 @@ services: - internal_token - jwt_secret - secret_key + - smtp_passwd environment: - - GITEA_APP_NAME=${APP_NAME} - - GITEA_DB_HOST=${DB_HOST} - - GITEA_DB_NAME=${DB_NAME} - - GITEA_DB_TYPE=${DB_TYPE} - - GITEA_DB_USER=${DB_USER} + - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION + - GITEA_APP_NAME + - GITEA_AUTO_WATCH_NEW_REPOS + - GITEA_DB_HOST=mariadb:3306 + - GITEA_DB_NAME=gitea + - GITEA_DB_TYPE=mysql + - GITEA_DB_USER=gitea + - GITEA_DISABLE_REGISTRATION - GITEA_DOMAIN=${DOMAIN} - - GITEA_SSH_PORT=${SSH_HOST_PORT} + - GITEA_ENABLE_NOTIFY_MAIL + - GITEA_ENABLE_OPENID_SIGNIN + - GITEA_ENABLE_OPENID_SIGNUP + - GITEA_MAILER_FROM + - GITEA_MAILER_HOST + - GITEA_MAILER_USER + - GITEA_SSH_PORT volumes: - "git:/data" + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" networks: - proxy - internal @@ -30,24 +42,22 @@ services: interval: 15s timeout: 10s retries: 10 - start_period: 15s + start_period: 30s deploy: update_config: failure_action: rollback order: start-first labels: - "traefik.enable=true" - - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.gitea.entrypoints=web-secure" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}" - + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${SSH_HOST_PORT}" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - mariadb: + database: image: "mariadb:10.5" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci @@ -71,25 +81,28 @@ networks: configs: app_ini: - name: ${APP_INI_VERSION} + name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang secrets: db_passwd: - name: ${DB_PASSWD_VERSION} + name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} external: true db_root_passwd: - name: ${DB_ROOT_PASSWD_VERSION} + name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION} external: true internal_token: - name: ${INTERNAL_TOKEN_VERSION} + name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${JWT_SECRET_VERSION} + name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} external: true secret_key: - name: ${SECRET_KEY_VERSION} + name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + external: true + smtp_passwd: + name: ${STACK_NAME}_smtp_passwd_${SMTP_PASSWD_VERSION} external: true volumes: diff --git a/helpers.sh b/helpers.sh deleted file mode 100755 index 72f75d4..0000000 --- a/helpers.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -create-admin () { - container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) - docker exec "$container" \ - gitea \ - --custom-path /data/gitea/ \ - --config /data/gitea/conf/app.ini \ - admin \ - create-user \ - --admin \ - --username autonomic \ - --password autonomic \ - --email autonomic@autonomic.zone -} -- 2.47.2 From a68c6e7b651d24425478a96f3c626ac1835435c4 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:25:48 +0100 Subject: [PATCH 038/304] Migrating from git.autonomic.zone repo --- .drone.yml | 37 +++++++++++++++++++++++++++++++++++++ README.md | 2 +- app.ini.tmpl | 28 ++++++++++++++++++++++++++++ compose.yml | 51 ++++++++++++++++++++++++++++++++------------------- helpers.sh | 15 --------------- 5 files changed, 98 insertions(+), 35 deletions(-) create mode 100644 .drone.yml delete mode 100755 helpers.sh diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..c6119b5 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,37 @@ +--- +kind: pipeline +name: deploy to swarm-test.autonomic.zone +steps: + - name: deployment + image: decentral1se/stack-ssh-deploy:latest + settings: + host: swarm-test.autonomic.zone + stack: gitea + deploy_key: + from_secret: drone_ssh_swarm_test + environment: + DOMAIN: gitea.swarm-test.autonomic.zone + STACK_NAME: gitea + LETS_ENCRYPT_ENV: production + GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true + GITEA_APP_NAME: Git with solidaritea + GITEA_AUTO_WATCH_NEW_REPOS: false + GITEA_DISABLE_REGISTRATION: false + GITEA_DOMAIN:gitea.swarm-test.autonomic.zone + GITEA_ENABLE_NOTIFY_MAIL: false + GITEA_ENABLE_OPENID_SIGNIN: true + GITEA_ENABLE_OPENID_SIGNUP: true + GITEA_MAILER_FROM: foo@example.com + GITEA_MAILER_HOST: smtp.example.com + GITEA_MAILER_USER: foo@example.com + GITEA_SSH_PORT: 2222 + APP_INI_VERSION: v1 + DB_PASSWD_VERSION: v1 + DB_ROOT_PASSWD_VERSION: v1 + INTERNAL_TOKEN_VERSION: v1 + JWT_SECRET_VERSION: v1 + SECRET_KEY_VERSION: v1 + SMTP_PASSWD_VERSION: v1 +trigger: + branch: + - master diff --git a/README.md b/README.md index 00326e0..2e516f1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # gitea -> https://gitea.io +[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) diff --git a/app.ini.tmpl b/app.ini.tmpl index c6d494c..4a779b1 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -1,13 +1,25 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} RUN_MODE = prod +RUN_USER = git [database] +CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_passwd" }} USER = {{ env "GITEA_DB_USER" }} +[service] +ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }} +AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} +DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }} +ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }} + +[openid] +ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }} +ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }} + [repository] DEFAULT_BRANCH = main @@ -17,6 +29,7 @@ STARTUP_TIMEOUT = 0 [server] APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} +LANDING_PAGE = organizations ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} @@ -31,6 +44,21 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} +[mailer] +ENABLED = true +FROM = {{ env "GITEA_MAILER_FROM" }} +HOST = {{ env "GITEA_MAILER_HOST" }} +USER = {{ env "GITEA_MAILER_USER" }} +PASSWD = {{ secret "smtp_passwd" }} +MAILER_TYPE = smtp +IS_TLS_ENABLED = true + +[markup.restructuredtext] +ENABLED = true +FILE_EXTENSIONS = .rst +RENDER_COMMAND = rst2html +IS_INPUT_FILE = false + [picture] AVATAR_UPLOAD_PATH = /data/gitea/avatars REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars diff --git a/compose.yml b/compose.yml index 4049d3b..8866ff5 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: - gitea: + app: image: "gitea/gitea:1.12.5" configs: - source: app_ini @@ -12,16 +12,28 @@ services: - internal_token - jwt_secret - secret_key + - smtp_passwd environment: - - GITEA_APP_NAME=${APP_NAME} - - GITEA_DB_HOST=${DB_HOST} - - GITEA_DB_NAME=${DB_NAME} - - GITEA_DB_TYPE=${DB_TYPE} - - GITEA_DB_USER=${DB_USER} + - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION + - GITEA_APP_NAME + - GITEA_AUTO_WATCH_NEW_REPOS + - GITEA_DB_HOST=mariadb:3306 + - GITEA_DB_NAME=gitea + - GITEA_DB_TYPE=mysql + - GITEA_DB_USER=gitea + - GITEA_DISABLE_REGISTRATION - GITEA_DOMAIN=${DOMAIN} - - GITEA_SSH_PORT=${SSH_HOST_PORT} + - GITEA_ENABLE_NOTIFY_MAIL + - GITEA_ENABLE_OPENID_SIGNIN + - GITEA_ENABLE_OPENID_SIGNUP + - GITEA_MAILER_FROM + - GITEA_MAILER_HOST + - GITEA_MAILER_USER + - GITEA_SSH_PORT volumes: - "git:/data" + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" networks: - proxy - internal @@ -30,24 +42,22 @@ services: interval: 15s timeout: 10s retries: 10 - start_period: 15s + start_period: 30s deploy: update_config: failure_action: rollback order: start-first labels: - "traefik.enable=true" - - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.gitea.entrypoints=web-secure" - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}" - + - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${SSH_HOST_PORT}" + - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - mariadb: + database: image: "mariadb:10.5" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci @@ -71,25 +81,28 @@ networks: configs: app_ini: - name: ${APP_INI_VERSION} + name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang secrets: db_passwd: - name: ${DB_PASSWD_VERSION} + name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} external: true db_root_passwd: - name: ${DB_ROOT_PASSWD_VERSION} + name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION} external: true internal_token: - name: ${INTERNAL_TOKEN_VERSION} + name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${JWT_SECRET_VERSION} + name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} external: true secret_key: - name: ${SECRET_KEY_VERSION} + name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + external: true + smtp_passwd: + name: ${STACK_NAME}_smtp_passwd_${SMTP_PASSWD_VERSION} external: true volumes: diff --git a/helpers.sh b/helpers.sh deleted file mode 100755 index 72f75d4..0000000 --- a/helpers.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -create-admin () { - container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q) - docker exec "$container" \ - gitea \ - --custom-path /data/gitea/ \ - --config /data/gitea/conf/app.ini \ - admin \ - create-user \ - --admin \ - --username autonomic \ - --password autonomic \ - --email autonomic@autonomic.zone -} -- 2.47.2 From 211b4d55462e7c5c2ea9b01a2969e9f814bf5666 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:32:00 +0100 Subject: [PATCH 039/304] Shorter service name --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8866ff5..dee111e 100644 --- a/compose.yml +++ b/compose.yml @@ -57,7 +57,7 @@ services: - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - database: + db: image: "mariadb:10.5" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci -- 2.47.2 From 7b023e8054205be6cbfe21290c2243c196e403c7 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:32:00 +0100 Subject: [PATCH 040/304] Shorter service name --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8866ff5..dee111e 100644 --- a/compose.yml +++ b/compose.yml @@ -57,7 +57,7 @@ services: - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - database: + db: image: "mariadb:10.5" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci -- 2.47.2 From 11351bc36d2b139c342f7e2406f2aec0fa1bd33d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:33:00 +0100 Subject: [PATCH 041/304] Use shorter name --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index dee111e..231dc70 100644 --- a/compose.yml +++ b/compose.yml @@ -17,7 +17,7 @@ services: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME - GITEA_AUTO_WATCH_NEW_REPOS - - GITEA_DB_HOST=mariadb:3306 + - GITEA_DB_HOST=db:3306 - GITEA_DB_NAME=gitea - GITEA_DB_TYPE=mysql - GITEA_DB_USER=gitea -- 2.47.2 From 5aec7e209e8d36bfc145da412374166c8ebf918d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:33:00 +0100 Subject: [PATCH 042/304] Use shorter name --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index dee111e..231dc70 100644 --- a/compose.yml +++ b/compose.yml @@ -17,7 +17,7 @@ services: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME - GITEA_AUTO_WATCH_NEW_REPOS - - GITEA_DB_HOST=mariadb:3306 + - GITEA_DB_HOST=db:3306 - GITEA_DB_NAME=gitea - GITEA_DB_TYPE=mysql - GITEA_DB_USER=gitea -- 2.47.2 From 140228b8afb462ca00fd121f6c75bb53c6f98467 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:35:37 +0100 Subject: [PATCH 043/304] Add spacing --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c6119b5..79d3754 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: GITEA_APP_NAME: Git with solidaritea GITEA_AUTO_WATCH_NEW_REPOS: false GITEA_DISABLE_REGISTRATION: false - GITEA_DOMAIN:gitea.swarm-test.autonomic.zone + GITEA_DOMAIN: gitea.swarm-test.autonomic.zone GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true -- 2.47.2 From f2bf53d1de73ae867994fe071f42d1532f7eb59e Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:35:37 +0100 Subject: [PATCH 044/304] Add spacing --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c6119b5..79d3754 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: GITEA_APP_NAME: Git with solidaritea GITEA_AUTO_WATCH_NEW_REPOS: false GITEA_DISABLE_REGISTRATION: false - GITEA_DOMAIN:gitea.swarm-test.autonomic.zone + GITEA_DOMAIN: gitea.swarm-test.autonomic.zone GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true -- 2.47.2 From 7aa5a8368f053c2e6211c43d9bb16fef7e206f0a Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:36:05 +0100 Subject: [PATCH 045/304] Quote that sucka --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 231dc70..160f1d0 100644 --- a/compose.yml +++ b/compose.yml @@ -17,7 +17,7 @@ services: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME - GITEA_AUTO_WATCH_NEW_REPOS - - GITEA_DB_HOST=db:3306 + - GITEA_DB_HOST="db:3306" - GITEA_DB_NAME=gitea - GITEA_DB_TYPE=mysql - GITEA_DB_USER=gitea -- 2.47.2 From 5783324c6b344a0c1b570c7463b9b9e1bcb14b13 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:36:05 +0100 Subject: [PATCH 046/304] Quote that sucka --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 231dc70..160f1d0 100644 --- a/compose.yml +++ b/compose.yml @@ -17,7 +17,7 @@ services: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME - GITEA_AUTO_WATCH_NEW_REPOS - - GITEA_DB_HOST=db:3306 + - GITEA_DB_HOST="db:3306" - GITEA_DB_NAME=gitea - GITEA_DB_TYPE=mysql - GITEA_DB_USER=gitea -- 2.47.2 From 0b0ed69dc4e7f7312f639521de5caab39d8b4d11 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:36:39 +0100 Subject: [PATCH 047/304] Generate and purge --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 79d3754..9fce15e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ steps: settings: host: swarm-test.autonomic.zone stack: gitea + generate_secrets: true + purge: true deploy_key: from_secret: drone_ssh_swarm_test environment: -- 2.47.2 From 64b4923413320163d2ef46c29d8d54304fa812df Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 27 Oct 2020 11:36:39 +0100 Subject: [PATCH 048/304] Generate and purge --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 79d3754..9fce15e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ steps: settings: host: swarm-test.autonomic.zone stack: gitea + generate_secrets: true + purge: true deploy_key: from_secret: drone_ssh_swarm_test environment: -- 2.47.2 From 0557fca272cd77690bf51828aa1f6a1e7dcd2f47 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Nov 2020 08:00:54 +0000 Subject: [PATCH 049/304] Update gitea/gitea Docker tag to v1.12.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 160f1d0..10ca058 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.12.5" + image: "gitea/gitea:1.12.6" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 7570b1307edfe0b8150e967726647862d1a8d212 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Nov 2020 08:00:54 +0000 Subject: [PATCH 050/304] Update gitea/gitea Docker tag to v1.12.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 160f1d0..10ca058 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.12.5" + image: "gitea/gitea:1.12.6" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 35b16871f4522ae99baf2757f5420c259dd98217 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Dec 2020 08:01:05 +0000 Subject: [PATCH 051/304] Update gitea/gitea Docker tag to v1.13.0 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 10ca058..e054b71 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.12.6" + image: "gitea/gitea:1.13.0" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From cda519452da81641a73358ea16bd0dd5c48cb79b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 2 Dec 2020 08:01:05 +0000 Subject: [PATCH 052/304] Update gitea/gitea Docker tag to v1.13.0 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 10ca058..e054b71 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.12.6" + image: "gitea/gitea:1.13.0" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From db91b3fdae7ff223681179ac974a8dabf72b89e1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 29 Dec 2020 08:01:10 +0000 Subject: [PATCH 053/304] Update gitea/gitea Docker tag to v1.13.1 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e054b71..a364590 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.0" + image: "gitea/gitea:1.13.1" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 3913cb94e9e4933daeeac4a055bec50dd1451810 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 29 Dec 2020 08:01:10 +0000 Subject: [PATCH 054/304] Update gitea/gitea Docker tag to v1.13.1 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e054b71..a364590 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.0" + image: "gitea/gitea:1.13.1" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 873d3d7f9c890944719210f2e38e4cf08c6cdbe8 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 29 Dec 2020 17:19:21 +0100 Subject: [PATCH 055/304] Update sample env --- .envrc.sample | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index 09173d6..fa41f9e 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,14 +1,28 @@ -export APP_INI_VERSION=v1 -export APP_NAME=gitea -export DB_HOST=mariadb:3306 -export DB_NAME=gitea +export APP=gitea +export STACK_NAME=gitea + +export DOMAIN=git.autonomic.zone +export LETS_ENCRYPT_ENV=production + +export GITEA_DOMAIN=git.autonomic.zone +export GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true +export GITEA_APP_NAME=Git with solidaritea +export GITEA_AUTO_WATCH_NEW_REPOS=false +export GITEA_DISABLE_REGISTRATION=false +export GITEA_ENABLE_NOTIFY_MAIL=true +export GITEA_ENABLE_OPENID_SIGNIN=true +export GITEA_ENABLE_OPENID_SIGNUP=true + +export GITEA_MAILER_FROM=noreply@autonomic.zone +export GITEA_MAILER_HOST=mail.gandi.net:465 +export GITEA_MAILER_USER=noreply@autonomic.zone + +export GITEA_SSH_PORT=2222 + +export APP_INI_VERSION=v2 export DB_PASSWD_VERSION=v1 -export DB_TYPE=mysql -export DB_USER=gitea -export DOMAIN=gitea.swarm.autonomic.zone +export DB_ROOT_PASSWD_VERSION=v1 export INTERNAL_TOKEN_VERSION=v1 export JWT_SECRET_VERSION=v1 -export LETS_ENCRYPT_ENV=production export SECRET_KEY_VERSION=v1 -export SSH_HOST_PORT=2222 -export STACK_NAME=gitea +export SMTP_PASSWD_VERSION=v1 -- 2.47.2 From b1cecc9a6ed1c5c1a2083a304314c374c5dece28 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 29 Dec 2020 17:19:21 +0100 Subject: [PATCH 056/304] Update sample env --- .envrc.sample | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index 09173d6..fa41f9e 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,14 +1,28 @@ -export APP_INI_VERSION=v1 -export APP_NAME=gitea -export DB_HOST=mariadb:3306 -export DB_NAME=gitea +export APP=gitea +export STACK_NAME=gitea + +export DOMAIN=git.autonomic.zone +export LETS_ENCRYPT_ENV=production + +export GITEA_DOMAIN=git.autonomic.zone +export GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true +export GITEA_APP_NAME=Git with solidaritea +export GITEA_AUTO_WATCH_NEW_REPOS=false +export GITEA_DISABLE_REGISTRATION=false +export GITEA_ENABLE_NOTIFY_MAIL=true +export GITEA_ENABLE_OPENID_SIGNIN=true +export GITEA_ENABLE_OPENID_SIGNUP=true + +export GITEA_MAILER_FROM=noreply@autonomic.zone +export GITEA_MAILER_HOST=mail.gandi.net:465 +export GITEA_MAILER_USER=noreply@autonomic.zone + +export GITEA_SSH_PORT=2222 + +export APP_INI_VERSION=v2 export DB_PASSWD_VERSION=v1 -export DB_TYPE=mysql -export DB_USER=gitea -export DOMAIN=gitea.swarm.autonomic.zone +export DB_ROOT_PASSWD_VERSION=v1 export INTERNAL_TOKEN_VERSION=v1 export JWT_SECRET_VERSION=v1 -export LETS_ENCRYPT_ENV=production export SECRET_KEY_VERSION=v1 -export SSH_HOST_PORT=2222 -export STACK_NAME=gitea +export SMTP_PASSWD_VERSION=v1 -- 2.47.2 From adcb53b61c52b4514be55ba8af72d8d5e01c641c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 30 Dec 2020 11:24:21 +0100 Subject: [PATCH 057/304] Use new set -a/+a syntax --- .envrc.sample | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index fa41f9e..1e1695b 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,28 +1,28 @@ -export APP=gitea -export STACK_NAME=gitea +APP=gitea +STACK_NAME=gitea -export DOMAIN=git.autonomic.zone -export LETS_ENCRYPT_ENV=production +DOMAIN=git.autonomic.zone +LETS_ENCRYPT_ENV=production -export GITEA_DOMAIN=git.autonomic.zone -export GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true -export GITEA_APP_NAME=Git with solidaritea -export GITEA_AUTO_WATCH_NEW_REPOS=false -export GITEA_DISABLE_REGISTRATION=false -export GITEA_ENABLE_NOTIFY_MAIL=true -export GITEA_ENABLE_OPENID_SIGNIN=true -export GITEA_ENABLE_OPENID_SIGNUP=true +GITEA_DOMAIN=git.autonomic.zone +GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true +GITEA_APP_NAME=Git with solidaritea +GITEA_AUTO_WATCH_NEW_REPOS=false +GITEA_DISABLE_REGISTRATION=false +GITEA_ENABLE_NOTIFY_MAIL=true +GITEA_ENABLE_OPENID_SIGNIN=true +GITEA_ENABLE_OPENID_SIGNUP=true -export GITEA_MAILER_FROM=noreply@autonomic.zone -export GITEA_MAILER_HOST=mail.gandi.net:465 -export GITEA_MAILER_USER=noreply@autonomic.zone +GITEA_MAILER_FROM=noreply@autonomic.zone +GITEA_MAILER_HOST=mail.gandi.net:465 +GITEA_MAILER_USER=noreply@autonomic.zone -export GITEA_SSH_PORT=2222 +GITEA_SSH_PORT=2222 -export APP_INI_VERSION=v2 -export DB_PASSWD_VERSION=v1 -export DB_ROOT_PASSWD_VERSION=v1 -export INTERNAL_TOKEN_VERSION=v1 -export JWT_SECRET_VERSION=v1 -export SECRET_KEY_VERSION=v1 -export SMTP_PASSWD_VERSION=v1 +APP_INI_VERSION=v2 +DB_PASSWD_VERSION=v1 +DB_ROOT_PASSWD_VERSION=v1 +INTERNAL_TOKEN_VERSION=v1 +JWT_SECRET_VERSION=v1 +SECRET_KEY_VERSION=v1 +SMTP_PASSWD_VERSION=v1 -- 2.47.2 From 61adce565198e655fc6c05f7153573270f6f9eb6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 30 Dec 2020 11:24:21 +0100 Subject: [PATCH 058/304] Use new set -a/+a syntax --- .envrc.sample | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.envrc.sample b/.envrc.sample index fa41f9e..1e1695b 100644 --- a/.envrc.sample +++ b/.envrc.sample @@ -1,28 +1,28 @@ -export APP=gitea -export STACK_NAME=gitea +APP=gitea +STACK_NAME=gitea -export DOMAIN=git.autonomic.zone -export LETS_ENCRYPT_ENV=production +DOMAIN=git.autonomic.zone +LETS_ENCRYPT_ENV=production -export GITEA_DOMAIN=git.autonomic.zone -export GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true -export GITEA_APP_NAME=Git with solidaritea -export GITEA_AUTO_WATCH_NEW_REPOS=false -export GITEA_DISABLE_REGISTRATION=false -export GITEA_ENABLE_NOTIFY_MAIL=true -export GITEA_ENABLE_OPENID_SIGNIN=true -export GITEA_ENABLE_OPENID_SIGNUP=true +GITEA_DOMAIN=git.autonomic.zone +GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true +GITEA_APP_NAME=Git with solidaritea +GITEA_AUTO_WATCH_NEW_REPOS=false +GITEA_DISABLE_REGISTRATION=false +GITEA_ENABLE_NOTIFY_MAIL=true +GITEA_ENABLE_OPENID_SIGNIN=true +GITEA_ENABLE_OPENID_SIGNUP=true -export GITEA_MAILER_FROM=noreply@autonomic.zone -export GITEA_MAILER_HOST=mail.gandi.net:465 -export GITEA_MAILER_USER=noreply@autonomic.zone +GITEA_MAILER_FROM=noreply@autonomic.zone +GITEA_MAILER_HOST=mail.gandi.net:465 +GITEA_MAILER_USER=noreply@autonomic.zone -export GITEA_SSH_PORT=2222 +GITEA_SSH_PORT=2222 -export APP_INI_VERSION=v2 -export DB_PASSWD_VERSION=v1 -export DB_ROOT_PASSWD_VERSION=v1 -export INTERNAL_TOKEN_VERSION=v1 -export JWT_SECRET_VERSION=v1 -export SECRET_KEY_VERSION=v1 -export SMTP_PASSWD_VERSION=v1 +APP_INI_VERSION=v2 +DB_PASSWD_VERSION=v1 +DB_ROOT_PASSWD_VERSION=v1 +INTERNAL_TOKEN_VERSION=v1 +JWT_SECRET_VERSION=v1 +SECRET_KEY_VERSION=v1 +SMTP_PASSWD_VERSION=v1 -- 2.47.2 From 5d3fa1ad4f912b11d28253b852e1d3b4a524dddc Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 30 Dec 2020 11:24:37 +0100 Subject: [PATCH 059/304] Use new file type --- .envrc.sample => .env.sample | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .envrc.sample => .env.sample (100%) diff --git a/.envrc.sample b/.env.sample similarity index 100% rename from .envrc.sample rename to .env.sample -- 2.47.2 From c9f8c0b47fcd7ca1ffd09a2e9af37bed221ded17 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 30 Dec 2020 11:24:37 +0100 Subject: [PATCH 060/304] Use new file type --- .envrc.sample => .env.sample | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .envrc.sample => .env.sample (100%) diff --git a/.envrc.sample b/.env.sample similarity index 100% rename from .envrc.sample rename to .env.sample -- 2.47.2 From 3ef1eb6fb696050ce8e0409392f226ee572c212c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 15:26:15 +0100 Subject: [PATCH 061/304] Use `PASSWORD` secret convention See https://git.autonomic.zone/coop-cloud/abra/pulls/33. --- .drone.yml | 12 ++++++------ .env.sample | 15 ++++++++------- compose.yml | 14 ++++++++------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9fce15e..24b0186 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,12 +28,12 @@ steps: GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 APP_INI_VERSION: v1 - DB_PASSWD_VERSION: v1 - DB_ROOT_PASSWD_VERSION: v1 - INTERNAL_TOKEN_VERSION: v1 - JWT_SECRET_VERSION: v1 - SECRET_KEY_VERSION: v1 - SMTP_PASSWD_VERSION: v1 + SECRET_DB_PASSWORD_VERSION: v1 + SECRET_DB_ROOT_PASSWORD_VERSION: v1 + SECRET_INTERNAL_TOKEN_VERSION: v1 + SECRET_JWT_SECRET_VERSION: v1 + SECRET_SECRET_KEY_VERSION: v1 + SECRET_SMTP_PASSWORD_VERSION: v1 trigger: branch: - master diff --git a/.env.sample b/.env.sample index 1e1695b..eeec261 100644 --- a/.env.sample +++ b/.env.sample @@ -1,4 +1,4 @@ -APP=gitea +TYPE=gitea STACK_NAME=gitea DOMAIN=git.autonomic.zone @@ -20,9 +20,10 @@ GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 APP_INI_VERSION=v2 -DB_PASSWD_VERSION=v1 -DB_ROOT_PASSWD_VERSION=v1 -INTERNAL_TOKEN_VERSION=v1 -JWT_SECRET_VERSION=v1 -SECRET_KEY_VERSION=v1 -SMTP_PASSWD_VERSION=v1 + +SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECRET_DB_PASSWORD_VERSION=v1 +SECRET_DB_ROOT_PASSWORD_VERSION=v1 +SECRET_JWT_SECRET_VERSION=v1 # length=43 +SECRET_SECRET_KEY_VERSION=v1 # length=64 +SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/compose.yml b/compose.yml index a364590..b51fac1 100644 --- a/compose.yml +++ b/compose.yml @@ -85,24 +85,26 @@ configs: file: app.ini.tmpl template_driver: golang +# Note(decentral1se): migrate from passwd -> password +# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: db_passwd: - name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION} external: true db_root_passwd: - name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION} + name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION} external: true internal_token: - name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + name: ${STACK_NAME}_jwt_secret_${SECRET_JWT_SECRET_VERSION} external: true secret_key: - name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SMTP_PASSWD_VERSION} + name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} external: true volumes: -- 2.47.2 From 6fbb718cad72183112be34dd76cdc58127b861ad Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 15:26:15 +0100 Subject: [PATCH 062/304] Use `PASSWORD` secret convention See https://git.autonomic.zone/coop-cloud/abra/pulls/33. --- .drone.yml | 12 ++++++------ .env.sample | 15 ++++++++------- compose.yml | 14 ++++++++------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9fce15e..24b0186 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,12 +28,12 @@ steps: GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 APP_INI_VERSION: v1 - DB_PASSWD_VERSION: v1 - DB_ROOT_PASSWD_VERSION: v1 - INTERNAL_TOKEN_VERSION: v1 - JWT_SECRET_VERSION: v1 - SECRET_KEY_VERSION: v1 - SMTP_PASSWD_VERSION: v1 + SECRET_DB_PASSWORD_VERSION: v1 + SECRET_DB_ROOT_PASSWORD_VERSION: v1 + SECRET_INTERNAL_TOKEN_VERSION: v1 + SECRET_JWT_SECRET_VERSION: v1 + SECRET_SECRET_KEY_VERSION: v1 + SECRET_SMTP_PASSWORD_VERSION: v1 trigger: branch: - master diff --git a/.env.sample b/.env.sample index 1e1695b..eeec261 100644 --- a/.env.sample +++ b/.env.sample @@ -1,4 +1,4 @@ -APP=gitea +TYPE=gitea STACK_NAME=gitea DOMAIN=git.autonomic.zone @@ -20,9 +20,10 @@ GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 APP_INI_VERSION=v2 -DB_PASSWD_VERSION=v1 -DB_ROOT_PASSWD_VERSION=v1 -INTERNAL_TOKEN_VERSION=v1 -JWT_SECRET_VERSION=v1 -SECRET_KEY_VERSION=v1 -SMTP_PASSWD_VERSION=v1 + +SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECRET_DB_PASSWORD_VERSION=v1 +SECRET_DB_ROOT_PASSWORD_VERSION=v1 +SECRET_JWT_SECRET_VERSION=v1 # length=43 +SECRET_SECRET_KEY_VERSION=v1 # length=64 +SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/compose.yml b/compose.yml index a364590..b51fac1 100644 --- a/compose.yml +++ b/compose.yml @@ -85,24 +85,26 @@ configs: file: app.ini.tmpl template_driver: golang +# Note(decentral1se): migrate from passwd -> password +# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: db_passwd: - name: ${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION} + name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION} external: true db_root_passwd: - name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION} + name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION} external: true internal_token: - name: ${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION} + name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} external: true jwt_secret: - name: ${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION} + name: ${STACK_NAME}_jwt_secret_${SECRET_JWT_SECRET_VERSION} external: true secret_key: - name: ${STACK_NAME}_secret_key_${SECRET_KEY_VERSION} + name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SMTP_PASSWD_VERSION} + name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} external: true volumes: -- 2.47.2 From 810cbd497990eb98016b876d140fdef7f07f72ce Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 16:19:39 +0100 Subject: [PATCH 063/304] Single spaces --- .env.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.sample b/.env.sample index eeec261..38b1b68 100644 --- a/.env.sample +++ b/.env.sample @@ -21,9 +21,9 @@ GITEA_SSH_PORT=2222 APP_INI_VERSION=v2 -SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 -SECRET_JWT_SECRET_VERSION=v1 # length=43 -SECRET_SECRET_KEY_VERSION=v1 # length=64 +SECRET_JWT_SECRET_VERSION=v1 # length=43 +SECRET_SECRET_KEY_VERSION=v1 # length=64 SECRET_SMTP_PASSWORD_VERSION=v1 -- 2.47.2 From a2671f9623c435b5610ed096120400e5e7d607ef Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 16:19:39 +0100 Subject: [PATCH 064/304] Single spaces --- .env.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.sample b/.env.sample index eeec261..38b1b68 100644 --- a/.env.sample +++ b/.env.sample @@ -21,9 +21,9 @@ GITEA_SSH_PORT=2222 APP_INI_VERSION=v2 -SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 -SECRET_JWT_SECRET_VERSION=v1 # length=43 -SECRET_SECRET_KEY_VERSION=v1 # length=64 +SECRET_JWT_SECRET_VERSION=v1 # length=43 +SECRET_SECRET_KEY_VERSION=v1 # length=64 SECRET_SMTP_PASSWORD_VERSION=v1 -- 2.47.2 From 21f321402d3c3dfb2099e3bbee1aae8dcde69abf Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 16:21:30 +0100 Subject: [PATCH 065/304] Use quotes --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 38b1b68..ca0b705 100644 --- a/.env.sample +++ b/.env.sample @@ -6,7 +6,7 @@ LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.autonomic.zone GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true -GITEA_APP_NAME=Git with solidaritea +GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false GITEA_DISABLE_REGISTRATION=false GITEA_ENABLE_NOTIFY_MAIL=true -- 2.47.2 From d0f36ff112f81b1232e63390e763e55f9eeca753 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Thu, 31 Dec 2020 16:21:30 +0100 Subject: [PATCH 066/304] Use quotes --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 38b1b68..ca0b705 100644 --- a/.env.sample +++ b/.env.sample @@ -6,7 +6,7 @@ LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.autonomic.zone GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true -GITEA_APP_NAME=Git with solidaritea +GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false GITEA_DISABLE_REGISTRATION=false GITEA_ENABLE_NOTIFY_MAIL=true -- 2.47.2 From b7972a83e5e483ed3074c83f80412644d155293d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 2 Feb 2021 08:01:31 +0000 Subject: [PATCH 067/304] Update gitea/gitea Docker tag to v1.13.2 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index b51fac1..8c598bc 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.1" + image: "gitea/gitea:1.13.2" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From cfaf28fc6362960b6300b6b801248fe526093de0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 2 Feb 2021 08:01:31 +0000 Subject: [PATCH 068/304] Update gitea/gitea Docker tag to v1.13.2 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index b51fac1..8c598bc 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.1" + image: "gitea/gitea:1.13.2" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 69ed21caa57e3e41cf8dcbff9b15b3e3a2230365 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Mon, 8 Feb 2021 15:25:29 +0200 Subject: [PATCH 069/304] Move config to abra.sh, add SECRET to secrets Ref coop-cloud/abra#43 --- .env.sample | 4 +--- abra.sh | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 abra.sh diff --git a/.env.sample b/.env.sample index ca0b705..9789cfd 100644 --- a/.env.sample +++ b/.env.sample @@ -19,9 +19,7 @@ GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 -APP_INI_VERSION=v2 - -SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECRET_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 diff --git a/abra.sh b/abra.sh new file mode 100644 index 0000000..f29b389 --- /dev/null +++ b/abra.sh @@ -0,0 +1 @@ +export APP_INI_VERSION=v2 -- 2.47.2 From c5a2de6aeccddd9a7f4eae7085da5a732d654a5b Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Mon, 8 Feb 2021 15:25:29 +0200 Subject: [PATCH 070/304] Move config to abra.sh, add SECRET to secrets Ref coop-cloud/abra#43 --- .env.sample | 4 +--- abra.sh | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 abra.sh diff --git a/.env.sample b/.env.sample index ca0b705..9789cfd 100644 --- a/.env.sample +++ b/.env.sample @@ -19,9 +19,7 @@ GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 -APP_INI_VERSION=v2 - -SECERT_INTERNAL_TOKEN_VERSION=v1 # length=105 +SECRET_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 diff --git a/abra.sh b/abra.sh new file mode 100644 index 0000000..f29b389 --- /dev/null +++ b/abra.sh @@ -0,0 +1 @@ +export APP_INI_VERSION=v2 -- 2.47.2 From 4195c431c8fb44a20e455a77918768946bdbc883 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 14 Feb 2021 15:28:24 +0100 Subject: [PATCH 071/304] Signal to Traefik that you want that port open --- .drone.yml | 1 + .env.sample | 1 + 2 files changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 24b0186..fc7ab9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,6 +27,7 @@ steps: GITEA_MAILER_HOST: smtp.example.com GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 + GITEA_SSH_ENABLED: 1 APP_INI_VERSION: v1 SECRET_DB_PASSWORD_VERSION: v1 SECRET_DB_ROOT_PASSWORD_VERSION: v1 diff --git a/.env.sample b/.env.sample index 9789cfd..d6f4c16 100644 --- a/.env.sample +++ b/.env.sample @@ -18,6 +18,7 @@ GITEA_MAILER_HOST=mail.gandi.net:465 GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 +GITEA_SSH_ENABLED=1 SECRET_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 -- 2.47.2 From 28d42ea996db6ab4f8172323303be84e4578703a Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Sun, 14 Feb 2021 15:28:24 +0100 Subject: [PATCH 072/304] Signal to Traefik that you want that port open --- .drone.yml | 1 + .env.sample | 1 + 2 files changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 24b0186..fc7ab9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,6 +27,7 @@ steps: GITEA_MAILER_HOST: smtp.example.com GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 + GITEA_SSH_ENABLED: 1 APP_INI_VERSION: v1 SECRET_DB_PASSWORD_VERSION: v1 SECRET_DB_ROOT_PASSWORD_VERSION: v1 diff --git a/.env.sample b/.env.sample index 9789cfd..d6f4c16 100644 --- a/.env.sample +++ b/.env.sample @@ -18,6 +18,7 @@ GITEA_MAILER_HOST=mail.gandi.net:465 GITEA_MAILER_USER=noreply@autonomic.zone GITEA_SSH_PORT=2222 +GITEA_SSH_ENABLED=1 SECRET_INTERNAL_TOKEN_VERSION=v1 # length=105 SECRET_DB_PASSWORD_VERSION=v1 -- 2.47.2 From eec9273b1eb050134d23582b55cefe3c34348ea7 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 24 Feb 2021 12:19:43 +0100 Subject: [PATCH 073/304] Add a changelog file --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..11bddf3 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] -- 2.47.2 From cf394e351a7844468d1c1aff887b237850628971 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 24 Feb 2021 12:19:43 +0100 Subject: [PATCH 074/304] Add a changelog file --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..11bddf3 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] -- 2.47.2 From 2e512009e0e5bd2265045b6108381243e0438676 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 24 Feb 2021 12:19:49 +0100 Subject: [PATCH 075/304] Add experimental version format --- abra.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/abra.sh b/abra.sh index f29b389..c5a9b98 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1,4 @@ +export ABRA_TYPE_VERSION=1.35.1 +export ABRA_TYPE_DIGEST=2f0fdcf + export APP_INI_VERSION=v2 -- 2.47.2 From 6719562f7e335d1643a485c1ecd829c3f340716c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 24 Feb 2021 12:19:49 +0100 Subject: [PATCH 076/304] Add experimental version format --- abra.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/abra.sh b/abra.sh index f29b389..c5a9b98 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1,4 @@ +export ABRA_TYPE_VERSION=1.35.1 +export ABRA_TYPE_DIGEST=2f0fdcf + export APP_INI_VERSION=v2 -- 2.47.2 From 57765820c0955cd0c9b6d0a0beacdec7dcf69a6d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:15:19 +0100 Subject: [PATCH 077/304] Use STACK_NAME here --- compose.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compose.yml b/compose.yml index 8c598bc..c9eac70 100644 --- a/compose.yml +++ b/compose.yml @@ -49,13 +49,13 @@ services: order: start-first labels: - "traefik.enable=true" - - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - - "traefik.http.routers.gitea.entrypoints=web-secure" - - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" + - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000" + - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" + - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" + - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" db: image: "mariadb:10.5" -- 2.47.2 From 3a892a435087edd9932fd39b2b0cacd321fcfd5f Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:15:19 +0100 Subject: [PATCH 078/304] Use STACK_NAME here --- compose.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compose.yml b/compose.yml index 8c598bc..c9eac70 100644 --- a/compose.yml +++ b/compose.yml @@ -49,13 +49,13 @@ services: order: start-first labels: - "traefik.enable=true" - - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)" - - "traefik.http.routers.gitea.entrypoints=web-secure" - - "traefik.http.services.gitea.loadbalancer.server.port=3000" - - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)" - - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" + - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000" + - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" + - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" + - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" db: image: "mariadb:10.5" -- 2.47.2 From 79c45e2f0027db8e66369d1c854a7c2ae9f0e132 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:17:42 +0100 Subject: [PATCH 079/304] Attempt to drum up a versioning scheme here See https://git.autonomic.zone/coop-cloud/organising/issues/34. --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index c9eac70..178a5d3 100644 --- a/compose.yml +++ b/compose.yml @@ -56,6 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.{ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From 77bbb787e3d18245d2cb890eccf0872d461640a6 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:17:42 +0100 Subject: [PATCH 080/304] Attempt to drum up a versioning scheme here See https://git.autonomic.zone/coop-cloud/organising/issues/34. --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index c9eac70..178a5d3 100644 --- a/compose.yml +++ b/compose.yml @@ -56,6 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.{ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From c145440355f5cfe27bec4dd2d6065d5908dce05a Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:30:03 +0100 Subject: [PATCH 081/304] Add missing $ --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 178a5d3..a00071c 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.{ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.${ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From 191b22515ad5fc6d409c51e5a3ef7d925d816f93 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 11:30:03 +0100 Subject: [PATCH 082/304] Add missing $ --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 178a5d3..a00071c 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.{ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.${ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From 2b70678d0f856a7db48617822f7f814ab4383b72 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 12:24:18 +0100 Subject: [PATCH 083/304] Use `-` as separator --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index a00071c..6c16280 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.${ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}-${ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From ee3b5fb5edeea3b0ab6abeee19725a7f99a57101 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 2 Mar 2021 12:24:18 +0100 Subject: [PATCH 084/304] Use `-` as separator --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index a00071c..6c16280 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}.${ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}-${ABRA_TYPE_DIGEST}" db: image: "mariadb:10.5" -- 2.47.2 From e3cbffd214512a2afa8283460331ac87c732f616 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Tue, 2 Mar 2021 18:38:34 +0200 Subject: [PATCH 085/304] Follow new exciting README standard See coop-cloud/organising#31 --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e516f1..94d92b4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ -# gitea +# Gitea [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) + + +* **Category**: Development +* **Status**: ❷💛 +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Healthcheck**: Yes +* **Backups**: No +* **Email**: ? +* **Tests**: ❷💛 +* **SSO**: ❶💚 (OAuth) + + +## Basic usage + +1. Set up Docker Swarm and [`abra`][abra] +2. Deploy [`coop-cloud/traefik`][cc-traefik] +3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like + to save secrets in `pass`) +4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to + your Docker swarm box +5. `abra app YOURAPPDOMAIN deploy` -- 2.47.2 From 89b1f21aa3b8b315bbd4473e5db1bf43a4d1a223 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Tue, 2 Mar 2021 18:38:34 +0200 Subject: [PATCH 086/304] Follow new exciting README standard See coop-cloud/organising#31 --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e516f1..94d92b4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ -# gitea +# Gitea [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) + + +* **Category**: Development +* **Status**: ❷💛 +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Healthcheck**: Yes +* **Backups**: No +* **Email**: ? +* **Tests**: ❷💛 +* **SSO**: ❶💚 (OAuth) + + +## Basic usage + +1. Set up Docker Swarm and [`abra`][abra] +2. Deploy [`coop-cloud/traefik`][cc-traefik] +3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like + to save secrets in `pass`) +4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to + your Docker swarm box +5. `abra app YOURAPPDOMAIN deploy` -- 2.47.2 From e83acb73c88759b4a6d2fb4615eb08c5f995c219 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 8 Mar 2021 08:01:05 +0000 Subject: [PATCH 087/304] Update gitea/gitea Docker tag to v1.13.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 6c16280..2572d8b 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.2" + image: "gitea/gitea:1.13.4" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From c65cd908acb0846af9e50bba5756d55c9deffc45 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 8 Mar 2021 08:01:05 +0000 Subject: [PATCH 088/304] Update gitea/gitea Docker tag to v1.13.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 6c16280..2572d8b 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.2" + image: "gitea/gitea:1.13.4" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 577f3668ea20107e00ce0e379116fd0f0ed14874 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 13 Mar 2021 18:30:10 +0100 Subject: [PATCH 089/304] Use all services in new versioning scheme See https://git.autonomic.zone/coop-cloud/organising/issues/47. --- abra.sh | 7 +++++-- compose.yml | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index c5a9b98..cb46477 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,7 @@ -export ABRA_TYPE_VERSION=1.35.1 -export ABRA_TYPE_DIGEST=2f0fdcf +export ABRA_TYPE_APP_VERSION=1.13.4 +export ABRA_TYPE_APP_DIGEST=078f8918 + +export ABRA_TYPE_DB_VERSION=10.5 +export ABRA_TYPE_DB_DIGEST=e27cf5bc export APP_INI_VERSION=v2 diff --git a/compose.yml b/compose.yml index 2572d8b..ca8e218 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}-${ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}" db: image: "mariadb:10.5" @@ -74,6 +74,9 @@ services: - "mariadb:/var/lib/mysql" networks: - internal + deploy: + labels: + - "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}" networks: internal: -- 2.47.2 From acbf2d0cffda7a1ef873bcdd47cc9417ec743109 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 13 Mar 2021 18:30:10 +0100 Subject: [PATCH 090/304] Use all services in new versioning scheme See https://git.autonomic.zone/coop-cloud/organising/issues/47. --- abra.sh | 7 +++++-- compose.yml | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index c5a9b98..cb46477 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,7 @@ -export ABRA_TYPE_VERSION=1.35.1 -export ABRA_TYPE_DIGEST=2f0fdcf +export ABRA_TYPE_APP_VERSION=1.13.4 +export ABRA_TYPE_APP_DIGEST=078f8918 + +export ABRA_TYPE_DB_VERSION=10.5 +export ABRA_TYPE_DB_DIGEST=e27cf5bc export APP_INI_VERSION=v2 diff --git a/compose.yml b/compose.yml index 2572d8b..ca8e218 100644 --- a/compose.yml +++ b/compose.yml @@ -56,7 +56,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.version=${ABRA_TYPE_VERSION}-${ABRA_TYPE_DIGEST}" + - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}" db: image: "mariadb:10.5" @@ -74,6 +74,9 @@ services: - "mariadb:/var/lib/mysql" networks: - internal + deploy: + labels: + - "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}" networks: internal: -- 2.47.2 From 03c48f99de69c168550e8028441e33cee7afdb62 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sat, 20 Mar 2021 14:49:24 +0200 Subject: [PATCH 091/304] autonomic.zone -> example.com Ref coop-cloud/abra#111 --- .env.sample | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.env.sample b/.env.sample index d6f4c16..4b0249a 100644 --- a/.env.sample +++ b/.env.sample @@ -1,10 +1,10 @@ TYPE=gitea STACK_NAME=gitea -DOMAIN=git.autonomic.zone +DOMAIN=git.exaple.com LETS_ENCRYPT_ENV=production -GITEA_DOMAIN=git.autonomic.zone +GITEA_DOMAIN=git.exaple.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false @@ -13,9 +13,8 @@ GITEA_ENABLE_NOTIFY_MAIL=true GITEA_ENABLE_OPENID_SIGNIN=true GITEA_ENABLE_OPENID_SIGNUP=true -GITEA_MAILER_FROM=noreply@autonomic.zone -GITEA_MAILER_HOST=mail.gandi.net:465 -GITEA_MAILER_USER=noreply@autonomic.zone +GITEA_MAILER_FROM=noreply@example.com +GITEA_MAILER_USER=noreply@example.com GITEA_SSH_PORT=2222 GITEA_SSH_ENABLED=1 @@ -25,4 +24,7 @@ SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 SECRET_SECRET_KEY_VERSION=v1 # length=64 -SECRET_SMTP_PASSWORD_VERSION=v1 + +# Email +#GITEA_MAILER_HOST=mail.gandi.net:465 +#SECRET_SMTP_PASSWORD_VERSION=v1 -- 2.47.2 From c8ba720c9218c6790dd987c24de1242987ca54d3 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sat, 20 Mar 2021 14:49:24 +0200 Subject: [PATCH 092/304] autonomic.zone -> example.com Ref coop-cloud/abra#111 --- .env.sample | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.env.sample b/.env.sample index d6f4c16..4b0249a 100644 --- a/.env.sample +++ b/.env.sample @@ -1,10 +1,10 @@ TYPE=gitea STACK_NAME=gitea -DOMAIN=git.autonomic.zone +DOMAIN=git.exaple.com LETS_ENCRYPT_ENV=production -GITEA_DOMAIN=git.autonomic.zone +GITEA_DOMAIN=git.exaple.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false @@ -13,9 +13,8 @@ GITEA_ENABLE_NOTIFY_MAIL=true GITEA_ENABLE_OPENID_SIGNIN=true GITEA_ENABLE_OPENID_SIGNUP=true -GITEA_MAILER_FROM=noreply@autonomic.zone -GITEA_MAILER_HOST=mail.gandi.net:465 -GITEA_MAILER_USER=noreply@autonomic.zone +GITEA_MAILER_FROM=noreply@example.com +GITEA_MAILER_USER=noreply@example.com GITEA_SSH_PORT=2222 GITEA_SSH_ENABLED=1 @@ -25,4 +24,7 @@ SECRET_DB_PASSWORD_VERSION=v1 SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 SECRET_SECRET_KEY_VERSION=v1 # length=64 -SECRET_SMTP_PASSWORD_VERSION=v1 + +# Email +#GITEA_MAILER_HOST=mail.gandi.net:465 +#SECRET_SMTP_PASSWORD_VERSION=v1 -- 2.47.2 From a64ca1c69d35f23d3f082ba275725597aede4c44 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 24 Mar 2021 08:01:22 +0000 Subject: [PATCH 093/304] Update gitea/gitea Docker tag to v1.13.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index ca8e218..412c75e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.4" + image: "gitea/gitea:1.13.6" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From a2e7194e6ae357b9f8a6693f0aa9ac19dbe186cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 24 Mar 2021 08:01:22 +0000 Subject: [PATCH 094/304] Update gitea/gitea Docker tag to v1.13.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index ca8e218..412c75e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.4" + image: "gitea/gitea:1.13.6" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 4272488d45e7d22c6480e61165898c71fff962e8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 24 Mar 2021 09:37:47 +0100 Subject: [PATCH 095/304] Bump versions --- abra.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abra.sh b/abra.sh index cb46477..a1bd6ed 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,5 @@ -export ABRA_TYPE_APP_VERSION=1.13.4 -export ABRA_TYPE_APP_DIGEST=078f8918 +export ABRA_TYPE_APP_VERSION=1.13.6 +export ABRA_TYPE_APP_DIGEST=07349eb4 export ABRA_TYPE_DB_VERSION=10.5 export ABRA_TYPE_DB_DIGEST=e27cf5bc -- 2.47.2 From 65f249dff4e27c74cc535ce76ada618d67314dd6 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 24 Mar 2021 09:37:47 +0100 Subject: [PATCH 096/304] Bump versions --- abra.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abra.sh b/abra.sh index cb46477..a1bd6ed 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,5 @@ -export ABRA_TYPE_APP_VERSION=1.13.4 -export ABRA_TYPE_APP_DIGEST=078f8918 +export ABRA_TYPE_APP_VERSION=1.13.6 +export ABRA_TYPE_APP_DIGEST=07349eb4 export ABRA_TYPE_DB_VERSION=10.5 export ABRA_TYPE_DB_DIGEST=e27cf5bc -- 2.47.2 From cb8e0a819beac4c32c7b8c89f6dc5bfffe84f958 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 2 Apr 2021 21:18:35 +0200 Subject: [PATCH 097/304] Remove version handling --- abra.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/abra.sh b/abra.sh index a1bd6ed..f29b389 100644 --- a/abra.sh +++ b/abra.sh @@ -1,7 +1 @@ -export ABRA_TYPE_APP_VERSION=1.13.6 -export ABRA_TYPE_APP_DIGEST=07349eb4 - -export ABRA_TYPE_DB_VERSION=10.5 -export ABRA_TYPE_DB_DIGEST=e27cf5bc - export APP_INI_VERSION=v2 -- 2.47.2 From 733edf7ab8edade3f80be1575dc28896543bdc71 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 2 Apr 2021 21:18:35 +0200 Subject: [PATCH 098/304] Remove version handling --- abra.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/abra.sh b/abra.sh index a1bd6ed..f29b389 100644 --- a/abra.sh +++ b/abra.sh @@ -1,7 +1 @@ -export ABRA_TYPE_APP_VERSION=1.13.6 -export ABRA_TYPE_APP_DIGEST=07349eb4 - -export ABRA_TYPE_DB_VERSION=10.5 -export ABRA_TYPE_DB_DIGEST=e27cf5bc - export APP_INI_VERSION=v2 -- 2.47.2 From 83165fd34c2f46e4e2d8c3db5218eb0093a06be3 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sun, 4 Apr 2021 18:03:12 +0200 Subject: [PATCH 099/304] Auto-add service labels --- .env.sample | 6 +++--- compose.yml | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.env.sample b/.env.sample index 4b0249a..6848751 100644 --- a/.env.sample +++ b/.env.sample @@ -1,10 +1,10 @@ TYPE=gitea STACK_NAME=gitea -DOMAIN=git.exaple.com +DOMAIN=git.example.com LETS_ENCRYPT_ENV=production -GITEA_DOMAIN=git.exaple.com +GITEA_DOMAIN=git.example.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false @@ -27,4 +27,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # Email #GITEA_MAILER_HOST=mail.gandi.net:465 -#SECRET_SMTP_PASSWORD_VERSION=v1 +SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/compose.yml b/compose.yml index 412c75e..c21fa4c 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,4 @@ ---- version: "3.8" - services: app: image: "gitea/gitea:1.13.6" @@ -56,8 +54,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}" - + - coop-cloud.${STACK_NAME}.app.version=1.13.6-1d90f984 db: image: "mariadb:10.5" command: | @@ -75,20 +72,16 @@ services: networks: - internal deploy: - labels: - - "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}" - + labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef'] networks: internal: proxy: external: true - configs: app_ini: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang - # Note(decentral1se): migrate from passwd -> password # See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: @@ -110,7 +103,6 @@ secrets: smtp_passwd: name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} external: true - volumes: git: mariadb: -- 2.47.2 From 7536b3930e6d648e2ca9099c3e625926e4c66e5e Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Sun, 4 Apr 2021 18:03:12 +0200 Subject: [PATCH 100/304] Auto-add service labels --- .env.sample | 6 +++--- compose.yml | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.env.sample b/.env.sample index 4b0249a..6848751 100644 --- a/.env.sample +++ b/.env.sample @@ -1,10 +1,10 @@ TYPE=gitea STACK_NAME=gitea -DOMAIN=git.exaple.com +DOMAIN=git.example.com LETS_ENCRYPT_ENV=production -GITEA_DOMAIN=git.exaple.com +GITEA_DOMAIN=git.example.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_APP_NAME="Git with solidaritea" GITEA_AUTO_WATCH_NEW_REPOS=false @@ -27,4 +27,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # Email #GITEA_MAILER_HOST=mail.gandi.net:465 -#SECRET_SMTP_PASSWORD_VERSION=v1 +SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/compose.yml b/compose.yml index 412c75e..c21fa4c 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,4 @@ ---- version: "3.8" - services: app: image: "gitea/gitea:1.13.6" @@ -56,8 +54,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - "coop-cloud.${STACK_NAME}.app.version=${ABRA_TYPE_APP_VERSION}-${ABRA_TYPE_APP_DIGEST}" - + - coop-cloud.${STACK_NAME}.app.version=1.13.6-1d90f984 db: image: "mariadb:10.5" command: | @@ -75,20 +72,16 @@ services: networks: - internal deploy: - labels: - - "coop-cloud.${STACK_NAME}.db.version=${ABRA_TYPE_DB_VERSION}-${ABRA_TYPE_DB_DIGEST}" - + labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef'] networks: internal: proxy: external: true - configs: app_ini: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang - # Note(decentral1se): migrate from passwd -> password # See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: @@ -110,7 +103,6 @@ secrets: smtp_passwd: name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} external: true - volumes: git: mariadb: -- 2.47.2 From 48b56b9073a856b6eaa12f44dd19855f8c0f568c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:41:14 +0200 Subject: [PATCH 101/304] Remove experimental file --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 11bddf3..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [Unreleased] -- 2.47.2 From 55d814e5558e12f0f01067352235f71eece4e3bc Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:41:14 +0200 Subject: [PATCH 102/304] Remove experimental file --- CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 11bddf3..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), -and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - -## [Unreleased] -- 2.47.2 From c271eb4ff5fbc8a09664e8c13a61eac8e8a097db Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:41:34 +0200 Subject: [PATCH 103/304] Make SMTP mailer experimental See https://git.autonomic.zone/coop-cloud/gitea/issues/10. --- .env.sample | 8 +++++--- app.ini.tmpl | 2 ++ compose.smtp.yml | 15 +++++++++++++++ compose.yml | 7 ------- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 compose.smtp.yml diff --git a/.env.sample b/.env.sample index 6848751..c0f831f 100644 --- a/.env.sample +++ b/.env.sample @@ -25,6 +25,8 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 SECRET_SECRET_KEY_VERSION=v1 # length=64 -# Email -#GITEA_MAILER_HOST=mail.gandi.net:465 -SECRET_SMTP_PASSWORD_VERSION=v1 +# SMTP Mailer +# COMPOSE_FILE="compose.yml:compose.smtp.yml" +# GITEA_SMTP_MAILER_ENABLED=1 +# GITEA_MAILER_HOST=mail.gandi.net:465 +# SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 4a779b1..b5c9eee 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -44,6 +44,7 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} +{{ if eq (env "GITEA_SMTP_MAILER_ENABLED") "1" }} [mailer] ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} @@ -52,6 +53,7 @@ USER = {{ env "GITEA_MAILER_USER" }} PASSWD = {{ secret "smtp_passwd" }} MAILER_TYPE = smtp IS_TLS_ENABLED = true +{{ end }} [markup.restructuredtext] ENABLED = true diff --git a/compose.smtp.yml b/compose.smtp.yml new file mode 100644 index 0000000..7bba113 --- /dev/null +++ b/compose.smtp.yml @@ -0,0 +1,15 @@ +version: "3.8" +services: + app: + environment: + - GITEA_MAILER_FROM + - GITEA_MAILER_HOST + - GITEA_MAILER_USER + secrets: + - smtp_passwd +# Note(decentral1se): migrate from passwd -> password +# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 +secrets: + smtp_passwd: + name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} + external: true diff --git a/compose.yml b/compose.yml index c21fa4c..3e50095 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,6 @@ services: - internal_token - jwt_secret - secret_key - - smtp_passwd environment: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME @@ -24,9 +23,6 @@ services: - GITEA_ENABLE_NOTIFY_MAIL - GITEA_ENABLE_OPENID_SIGNIN - GITEA_ENABLE_OPENID_SIGNUP - - GITEA_MAILER_FROM - - GITEA_MAILER_HOST - - GITEA_MAILER_USER - GITEA_SSH_PORT volumes: - "git:/data" @@ -100,9 +96,6 @@ secrets: secret_key: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true - smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} - external: true volumes: git: mariadb: -- 2.47.2 From 314cb187c6960b3225717bf4960cc5a505b17327 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:41:34 +0200 Subject: [PATCH 104/304] Make SMTP mailer experimental See https://git.autonomic.zone/coop-cloud/gitea/issues/10. --- .env.sample | 8 +++++--- app.ini.tmpl | 2 ++ compose.smtp.yml | 15 +++++++++++++++ compose.yml | 7 ------- 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 compose.smtp.yml diff --git a/.env.sample b/.env.sample index 6848751..c0f831f 100644 --- a/.env.sample +++ b/.env.sample @@ -25,6 +25,8 @@ SECRET_DB_ROOT_PASSWORD_VERSION=v1 SECRET_JWT_SECRET_VERSION=v1 # length=43 SECRET_SECRET_KEY_VERSION=v1 # length=64 -# Email -#GITEA_MAILER_HOST=mail.gandi.net:465 -SECRET_SMTP_PASSWORD_VERSION=v1 +# SMTP Mailer +# COMPOSE_FILE="compose.yml:compose.smtp.yml" +# GITEA_SMTP_MAILER_ENABLED=1 +# GITEA_MAILER_HOST=mail.gandi.net:465 +# SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 4a779b1..b5c9eee 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -44,6 +44,7 @@ SECRET_KEY = {{ secret "secret_key" }} [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} +{{ if eq (env "GITEA_SMTP_MAILER_ENABLED") "1" }} [mailer] ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} @@ -52,6 +53,7 @@ USER = {{ env "GITEA_MAILER_USER" }} PASSWD = {{ secret "smtp_passwd" }} MAILER_TYPE = smtp IS_TLS_ENABLED = true +{{ end }} [markup.restructuredtext] ENABLED = true diff --git a/compose.smtp.yml b/compose.smtp.yml new file mode 100644 index 0000000..7bba113 --- /dev/null +++ b/compose.smtp.yml @@ -0,0 +1,15 @@ +version: "3.8" +services: + app: + environment: + - GITEA_MAILER_FROM + - GITEA_MAILER_HOST + - GITEA_MAILER_USER + secrets: + - smtp_passwd +# Note(decentral1se): migrate from passwd -> password +# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 +secrets: + smtp_passwd: + name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} + external: true diff --git a/compose.yml b/compose.yml index c21fa4c..3e50095 100644 --- a/compose.yml +++ b/compose.yml @@ -10,7 +10,6 @@ services: - internal_token - jwt_secret - secret_key - - smtp_passwd environment: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME @@ -24,9 +23,6 @@ services: - GITEA_ENABLE_NOTIFY_MAIL - GITEA_ENABLE_OPENID_SIGNIN - GITEA_ENABLE_OPENID_SIGNUP - - GITEA_MAILER_FROM - - GITEA_MAILER_HOST - - GITEA_MAILER_USER - GITEA_SSH_PORT volumes: - "git:/data" @@ -100,9 +96,6 @@ secrets: secret_key: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true - smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} - external: true volumes: git: mariadb: -- 2.47.2 From 0f558acef95094de9ccb614bbb777b0fe6b83d97 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:42:08 +0200 Subject: [PATCH 105/304] Use double quotes like the rest --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 3e50095..4bad88e 100644 --- a/compose.yml +++ b/compose.yml @@ -68,7 +68,7 @@ services: networks: - internal deploy: - labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef'] + labels: ["coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef"] networks: internal: proxy: -- 2.47.2 From 74784ab6e6f4f04152c5fa9cabdc38852c932ec7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:42:08 +0200 Subject: [PATCH 106/304] Use double quotes like the rest --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 3e50095..4bad88e 100644 --- a/compose.yml +++ b/compose.yml @@ -68,7 +68,7 @@ services: networks: - internal deploy: - labels: ['coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef'] + labels: ["coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef"] networks: internal: proxy: -- 2.47.2 From a099e702fa23edbb32ae6461d200c5bca90a5685 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:47:32 +0200 Subject: [PATCH 107/304] Final hold out on passwd -> password migration See https://git.autonomic.zone/coop-cloud/gitea/issues/10. --- compose.smtp.yml | 8 +++----- compose.yml | 20 +++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/compose.smtp.yml b/compose.smtp.yml index 7bba113..a0b57c8 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -6,10 +6,8 @@ services: - GITEA_MAILER_HOST - GITEA_MAILER_USER secrets: - - smtp_passwd -# Note(decentral1se): migrate from passwd -> password -# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 + - smtp_password secrets: - smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} + smtp_passord: + name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} external: true diff --git a/compose.yml b/compose.yml index 4bad88e..611bf7a 100644 --- a/compose.yml +++ b/compose.yml @@ -6,7 +6,7 @@ services: - source: app_ini target: /data/gitea/conf/app.ini secrets: - - db_passwd + - db_password - internal_token - jwt_secret - secret_key @@ -58,11 +58,11 @@ services: environment: - MYSQL_DATABASE=gitea - MYSQL_USER=gitea - - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd - - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd + - MYSQL_PASSWORD_FILE=/run/secrets/db_password + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password secrets: - - db_passwd - - db_root_passwd + - db_password + - db_root_password volumes: - "mariadb:/var/lib/mysql" networks: @@ -78,14 +78,12 @@ configs: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang -# Note(decentral1se): migrate from passwd -> password -# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: - db_passwd: - name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION} + db_password: + name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} external: true - db_root_passwd: - name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION} + db_root_password: + name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} external: true internal_token: name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} -- 2.47.2 From 2cc39f81d1cffa9b02d5dccc86cdadc7fdaa0234 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:47:32 +0200 Subject: [PATCH 108/304] Final hold out on passwd -> password migration See https://git.autonomic.zone/coop-cloud/gitea/issues/10. --- compose.smtp.yml | 8 +++----- compose.yml | 20 +++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/compose.smtp.yml b/compose.smtp.yml index 7bba113..a0b57c8 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -6,10 +6,8 @@ services: - GITEA_MAILER_HOST - GITEA_MAILER_USER secrets: - - smtp_passwd -# Note(decentral1se): migrate from passwd -> password -# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 + - smtp_password secrets: - smtp_passwd: - name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION} + smtp_passord: + name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} external: true diff --git a/compose.yml b/compose.yml index 4bad88e..611bf7a 100644 --- a/compose.yml +++ b/compose.yml @@ -6,7 +6,7 @@ services: - source: app_ini target: /data/gitea/conf/app.ini secrets: - - db_passwd + - db_password - internal_token - jwt_secret - secret_key @@ -58,11 +58,11 @@ services: environment: - MYSQL_DATABASE=gitea - MYSQL_USER=gitea - - MYSQL_PASSWORD_FILE=/run/secrets/db_passwd - - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd + - MYSQL_PASSWORD_FILE=/run/secrets/db_password + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password secrets: - - db_passwd - - db_root_passwd + - db_password + - db_root_password volumes: - "mariadb:/var/lib/mysql" networks: @@ -78,14 +78,12 @@ configs: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang -# Note(decentral1se): migrate from passwd -> password -# See https://git.autonomic.zone/coop-cloud/abra/pulls/33 secrets: - db_passwd: - name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION} + db_password: + name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} external: true - db_root_passwd: - name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION} + db_root_password: + name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} external: true internal_token: name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} -- 2.47.2 From 1ee40928b49ded79661074e25c9a3e5e2b092d2d Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:48:17 +0200 Subject: [PATCH 109/304] Drop optional vars --- .drone.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index fc7ab9d..d5e269d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,9 +23,6 @@ steps: GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true - GITEA_MAILER_FROM: foo@example.com - GITEA_MAILER_HOST: smtp.example.com - GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 GITEA_SSH_ENABLED: 1 APP_INI_VERSION: v1 @@ -34,7 +31,6 @@ steps: SECRET_INTERNAL_TOKEN_VERSION: v1 SECRET_JWT_SECRET_VERSION: v1 SECRET_SECRET_KEY_VERSION: v1 - SECRET_SMTP_PASSWORD_VERSION: v1 trigger: branch: - master -- 2.47.2 From 2c402aa6c8561beea1f4f5dbb68e92e48579555e Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:48:17 +0200 Subject: [PATCH 110/304] Drop optional vars --- .drone.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index fc7ab9d..d5e269d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,9 +23,6 @@ steps: GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true - GITEA_MAILER_FROM: foo@example.com - GITEA_MAILER_HOST: smtp.example.com - GITEA_MAILER_USER: foo@example.com GITEA_SSH_PORT: 2222 GITEA_SSH_ENABLED: 1 APP_INI_VERSION: v1 @@ -34,7 +31,6 @@ steps: SECRET_INTERNAL_TOKEN_VERSION: v1 SECRET_JWT_SECRET_VERSION: v1 SECRET_SECRET_KEY_VERSION: v1 - SECRET_SMTP_PASSWORD_VERSION: v1 trigger: branch: - master -- 2.47.2 From 37b925f0dee4d045ed45d6f854db8139eacd4826 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:51:59 +0200 Subject: [PATCH 111/304] Update app.ini version (SMTP config) --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index f29b389..44c721b 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v2 +export APP_INI_VERSION=v3 -- 2.47.2 From 98c004ae529706da08fb8088051d79bc94172660 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:51:59 +0200 Subject: [PATCH 112/304] Update app.ini version (SMTP config) --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index f29b389..44c721b 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v2 +export APP_INI_VERSION=v3 -- 2.47.2 From cf650b15029646ac41dbb551d57771dfe9c924f5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:59:00 +0200 Subject: [PATCH 113/304] Hard-code LFS_CONTENT_PATH Closes https://git.autonomic.zone/coop-cloud/gitea/issues/11. --- app.ini.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index b5c9eee..5e94b55 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -30,6 +30,7 @@ STARTUP_TIMEOUT = 0 APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations +LFS_CONTENT_PATH = /data/gitea/lfs ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} -- 2.47.2 From ef96887c2758d2119c963025a447cfc945bf462c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 13:59:00 +0200 Subject: [PATCH 114/304] Hard-code LFS_CONTENT_PATH Closes https://git.autonomic.zone/coop-cloud/gitea/issues/11. --- app.ini.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index b5c9eee..5e94b55 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -30,6 +30,7 @@ STARTUP_TIMEOUT = 0 APP_DATA_PATH = /data DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations +LFS_CONTENT_PATH = /data/gitea/lfs ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} -- 2.47.2 From 9c1da6d781d08398f7c67cff4a8c228989a8090a Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 7 Apr 2021 19:57:18 +0200 Subject: [PATCH 115/304] Fix default domain and remove STACK_NAME --- .env.sample | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index c0f831f..b188455 100644 --- a/.env.sample +++ b/.env.sample @@ -1,7 +1,6 @@ TYPE=gitea -STACK_NAME=gitea -DOMAIN=git.example.com +DOMAIN=gitea.example.com LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.example.com -- 2.47.2 From 1326c95b4c3b30fb7010463c26226e0f3c39c120 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 7 Apr 2021 19:57:18 +0200 Subject: [PATCH 116/304] Fix default domain and remove STACK_NAME --- .env.sample | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index c0f831f..b188455 100644 --- a/.env.sample +++ b/.env.sample @@ -1,7 +1,6 @@ TYPE=gitea -STACK_NAME=gitea -DOMAIN=git.example.com +DOMAIN=gitea.example.com LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.example.com -- 2.47.2 From cca5a27165065afb442ff0387a366077ecd6a03e Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 20:52:02 +0200 Subject: [PATCH 117/304] Fix naming --- app.ini.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index 5e94b55..b5a334b 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -7,7 +7,7 @@ CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} -PASSWD = {{ secret "db_passwd" }} +PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} [service] @@ -51,7 +51,7 @@ ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} HOST = {{ env "GITEA_MAILER_HOST" }} USER = {{ env "GITEA_MAILER_USER" }} -PASSWD = {{ secret "smtp_passwd" }} +PASSWD = {{ secret "smtp_password" }} MAILER_TYPE = smtp IS_TLS_ENABLED = true {{ end }} -- 2.47.2 From efdbc56f676507b78b2dd302ab75a4a57873da03 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Apr 2021 20:52:02 +0200 Subject: [PATCH 118/304] Fix naming --- app.ini.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index 5e94b55..b5a334b 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -7,7 +7,7 @@ CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} -PASSWD = {{ secret "db_passwd" }} +PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} [service] @@ -51,7 +51,7 @@ ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} HOST = {{ env "GITEA_MAILER_HOST" }} USER = {{ env "GITEA_MAILER_USER" }} -PASSWD = {{ secret "smtp_passwd" }} +PASSWD = {{ secret "smtp_password" }} MAILER_TYPE = smtp IS_TLS_ENABLED = true {{ end }} -- 2.47.2 From 6de43f2ca6748595fd5c848e4efa744021a8e3d9 Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 7 Apr 2021 21:19:23 +0200 Subject: [PATCH 119/304] Fix APP_DATA_PATH --- abra.sh | 2 +- app.ini.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abra.sh b/abra.sh index 44c721b..acc16a0 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v3 +export APP_INI_VERSION=v4 diff --git a/app.ini.tmpl b/app.ini.tmpl index b5a334b..adfd303 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -27,7 +27,7 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] -APP_DATA_PATH = /data +APP_DATA_PATH = /data/gitea DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations LFS_CONTENT_PATH = /data/gitea/lfs -- 2.47.2 From 264327d962bc150a5710e3ffb160fc71d6cf350c Mon Sep 17 00:00:00 2001 From: 3wc <3wc.git@doesthisthing.work> Date: Wed, 7 Apr 2021 21:19:23 +0200 Subject: [PATCH 120/304] Fix APP_DATA_PATH --- abra.sh | 2 +- app.ini.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abra.sh b/abra.sh index 44c721b..acc16a0 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v3 +export APP_INI_VERSION=v4 diff --git a/app.ini.tmpl b/app.ini.tmpl index b5a334b..adfd303 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -27,7 +27,7 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] -APP_DATA_PATH = /data +APP_DATA_PATH = /data/gitea DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations LFS_CONTENT_PATH = /data/gitea/lfs -- 2.47.2 From 2f4e1879f5c75593b2d507ad4175fa1a4610add0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 8 Apr 2021 07:01:27 +0000 Subject: [PATCH 121/304] Update gitea/gitea Docker tag to v1.13.7 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 611bf7a..c188680 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.6" + image: "gitea/gitea:1.13.7" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 525fffa9f22d49a23e5d1c5b8558f3f596feef0b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 8 Apr 2021 07:01:27 +0000 Subject: [PATCH 122/304] Update gitea/gitea Docker tag to v1.13.7 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 611bf7a..c188680 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.6" + image: "gitea/gitea:1.13.7" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From ca9e0ca9b5ad3506d8a7e16cb2943a92111cd1c4 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 8 Apr 2021 14:56:35 +0200 Subject: [PATCH 123/304] Version 1.13.7; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c188680..cd9a5a4 100644 --- a/compose.yml +++ b/compose.yml @@ -50,7 +50,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.13.6-1d90f984 + - coop-cloud.${STACK_NAME}.app.version=1.13.7-1b32b27c db: image: "mariadb:10.5" command: | -- 2.47.2 From ce9d0774b64d72e1df2a9d3f617396d925edab6a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 8 Apr 2021 14:56:35 +0200 Subject: [PATCH 124/304] Version 1.13.7; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c188680..cd9a5a4 100644 --- a/compose.yml +++ b/compose.yml @@ -50,7 +50,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.13.6-1d90f984 + - coop-cloud.${STACK_NAME}.app.version=1.13.7-1b32b27c db: image: "mariadb:10.5" command: | -- 2.47.2 From 87c64ff29c30995802ee317635d80f8b851cab0a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 12 Apr 2021 07:01:27 +0000 Subject: [PATCH 125/304] Update gitea/gitea Docker tag to v1.14.0 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index cd9a5a4..af543be 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.7" + image: "gitea/gitea:1.14.0" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From e30fff9cb62d11fc2cbcce75eef0eeefa564f1c3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 12 Apr 2021 07:01:27 +0000 Subject: [PATCH 126/304] Update gitea/gitea Docker tag to v1.14.0 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index cd9a5a4..af543be 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.13.7" + image: "gitea/gitea:1.14.0" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From b60e6bebd5d29fa561d25c38c8d4e69601997246 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 10:33:06 +0200 Subject: [PATCH 127/304] Version 1.14.0; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index af543be..21c1940 100644 --- a/compose.yml +++ b/compose.yml @@ -50,7 +50,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.13.7-1b32b27c + - coop-cloud.${STACK_NAME}.app.version=1.14.0-327bfb3f db: image: "mariadb:10.5" command: | -- 2.47.2 From c7fe2e66b670d6c05bf7b067e27c41a3a15d6f55 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 10:33:06 +0200 Subject: [PATCH 128/304] Version 1.14.0; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index af543be..21c1940 100644 --- a/compose.yml +++ b/compose.yml @@ -50,7 +50,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.13.7-1b32b27c + - coop-cloud.${STACK_NAME}.app.version=1.14.0-327bfb3f db: image: "mariadb:10.5" command: | -- 2.47.2 From fee184e6916ea08a0a46014296aa997ccbaa7469 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:51:48 +0200 Subject: [PATCH 129/304] Drop all non-customised options --- abra.sh | 2 +- app.ini.tmpl | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/abra.sh b/abra.sh index acc16a0..6102af0 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v4 +export APP_INI_VERSION=v5 diff --git a/app.ini.tmpl b/app.ini.tmpl index adfd303..5989357 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -1,9 +1,6 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} -RUN_MODE = prod -RUN_USER = git [database] -CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} -- 2.47.2 From 80fe33022602a5f1d1abd0c0aedd6eb8852dfbc5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:51:48 +0200 Subject: [PATCH 130/304] Drop all non-customised options --- abra.sh | 2 +- app.ini.tmpl | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/abra.sh b/abra.sh index acc16a0..6102af0 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1 @@ -export APP_INI_VERSION=v4 +export APP_INI_VERSION=v5 diff --git a/app.ini.tmpl b/app.ini.tmpl index adfd303..5989357 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -1,9 +1,6 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} -RUN_MODE = prod -RUN_USER = git [database] -CHARSET = utf8mb4 DB_TYPE = {{ env "GITEA_DB_TYPE" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} -- 2.47.2 From 3e5ecf48a9fb606295b5ea67cd87d7afff7d4564 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:51:59 +0200 Subject: [PATCH 131/304] Move over to the rootless image --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 21c1940..069eeaf 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.0" + image: "gitea/gitea:1.14.0-rootless" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 4b4c55089406aa590ff6506cd0fd031bbe4e588b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:51:59 +0200 Subject: [PATCH 132/304] Move over to the rootless image --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 21c1940..069eeaf 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.0" + image: "gitea/gitea:1.14.0-rootless" configs: - source: app_ini target: /data/gitea/conf/app.ini -- 2.47.2 From 5bf65cb7b66f3c5ad6fd45958ce453887d77fa1c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:52:10 +0200 Subject: [PATCH 133/304] Use the new rootless custom config/volumes config See https://docs.gitea.io/en-us/install-with-docker-rootless/. --- compose.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index 069eeaf..ebafd14 100644 --- a/compose.yml +++ b/compose.yml @@ -4,7 +4,7 @@ services: image: "gitea/gitea:1.14.0-rootless" configs: - source: app_ini - target: /data/gitea/conf/app.ini + target: /etc/gitea/app.ini secrets: - db_password - internal_token @@ -25,7 +25,8 @@ services: - GITEA_ENABLE_OPENID_SIGNUP - GITEA_SSH_PORT volumes: - - "git:/data" + - data:/var/lib/gitea + - config:/etc/gitea - "/etc/timezone:/etc/timezone:ro" - "/etc/localtime:/etc/localtime:ro" networks: @@ -95,5 +96,6 @@ secrets: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true volumes: - git: + data: + config: mariadb: -- 2.47.2 From 9662eed900c6dd435af4f40b401c009fac306804 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:52:10 +0200 Subject: [PATCH 134/304] Use the new rootless custom config/volumes config See https://docs.gitea.io/en-us/install-with-docker-rootless/. --- compose.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index 069eeaf..ebafd14 100644 --- a/compose.yml +++ b/compose.yml @@ -4,7 +4,7 @@ services: image: "gitea/gitea:1.14.0-rootless" configs: - source: app_ini - target: /data/gitea/conf/app.ini + target: /etc/gitea/app.ini secrets: - db_password - internal_token @@ -25,7 +25,8 @@ services: - GITEA_ENABLE_OPENID_SIGNUP - GITEA_SSH_PORT volumes: - - "git:/data" + - data:/var/lib/gitea + - config:/etc/gitea - "/etc/timezone:/etc/timezone:ro" - "/etc/localtime:/etc/localtime:ro" networks: @@ -95,5 +96,6 @@ secrets: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true volumes: - git: + data: + config: mariadb: -- 2.47.2 From 34c3a20d7f723715d2d0bee7abc90bb54d32eba7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:58:15 +0200 Subject: [PATCH 135/304] Drop quotes --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index ebafd14..8a8b640 100644 --- a/compose.yml +++ b/compose.yml @@ -27,8 +27,8 @@ services: volumes: - data:/var/lib/gitea - config:/etc/gitea - - "/etc/timezone:/etc/timezone:ro" - - "/etc/localtime:/etc/localtime:ro" + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: - proxy - internal -- 2.47.2 From 8ec12d9c121a4b8de2caad429b12a143fa00af5f Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 13 Apr 2021 16:58:15 +0200 Subject: [PATCH 136/304] Drop quotes --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index ebafd14..8a8b640 100644 --- a/compose.yml +++ b/compose.yml @@ -27,8 +27,8 @@ services: volumes: - data:/var/lib/gitea - config:/etc/gitea - - "/etc/timezone:/etc/timezone:ro" - - "/etc/localtime:/etc/localtime:ro" + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro networks: - proxy - internal -- 2.47.2 From 9af1887dd652afad5a260c7ada3b844058f48b6b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 16 Apr 2021 07:01:07 +0000 Subject: [PATCH 137/304] Update gitea/gitea Docker tag to v1.14.1 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8a8b640..1f752d6 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.0-rootless" + image: "gitea/gitea:1.14.1-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From b656061a5a7279e0330268f9c740514d3faeba78 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 16 Apr 2021 07:01:07 +0000 Subject: [PATCH 138/304] Update gitea/gitea Docker tag to v1.14.1 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8a8b640..1f752d6 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.0-rootless" + image: "gitea/gitea:1.14.1-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 14aa5b7f8c19e21364167c26f4927e484b70d5b5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 16 Apr 2021 09:07:43 +0200 Subject: [PATCH 139/304] Version 1.14.1-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 1f752d6..5552798 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.0-327bfb3f + - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc db: image: "mariadb:10.5" command: | -- 2.47.2 From 14fa475a5a3f129fcd65adff02f6de3a588172e7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 16 Apr 2021 09:07:43 +0200 Subject: [PATCH 140/304] Version 1.14.1-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 1f752d6..5552798 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.0-327bfb3f + - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc db: image: "mariadb:10.5" command: | -- 2.47.2 From 854ecfbf491c8adc53d06fc1a475f6f8d27b19d4 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 15:29:05 +0200 Subject: [PATCH 141/304] Hack the setup script and drop paths config --- abra.sh | 1 + app.ini.tmpl | 9 --------- compose.yml | 7 +++++++ docker-setup.sh.tmpl | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 docker-setup.sh.tmpl diff --git a/abra.sh b/abra.sh index 6102af0..bc03d58 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1,2 @@ export APP_INI_VERSION=v5 +export DOCKER_SETUP_SH_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 5989357..82dd588 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -24,10 +24,8 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] -APP_DATA_PATH = /data/gitea DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations -LFS_CONTENT_PATH = /data/gitea/lfs ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} @@ -58,10 +56,3 @@ ENABLED = true FILE_EXTENSIONS = .rst RENDER_COMMAND = rst2html IS_INPUT_FILE = false - -[picture] -AVATAR_UPLOAD_PATH = /data/gitea/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars - -[attachment] -PATH = /data/gitea/attachments diff --git a/compose.yml b/compose.yml index 5552798..cabcb8a 100644 --- a/compose.yml +++ b/compose.yml @@ -5,6 +5,9 @@ services: configs: - source: app_ini target: /etc/gitea/app.ini + - source: docker_setup_sh + target: /usr/local/bin/docker-setup.sh + mode: 0555 secrets: - db_password - internal_token @@ -79,6 +82,10 @@ configs: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang + docker_setup_sh: + name: ${STACK_NAME}_docker_setup_sh_${DOCKER_SETUP_SH_VERSION} + file: docker-setup.sh.tmpl + template_driver: golang secrets: db_password: name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl new file mode 100644 index 0000000..310e8f7 --- /dev/null +++ b/docker-setup.sh.tmpl @@ -0,0 +1,15 @@ +#!/bin/bash + +# modified version of https://github.com/go-gitea/gitea/blob/d7dbe4feebac7805a4ca184f0989f58de8063d96/docker/rootless/usr/local/bin/docker-setup.sh +# also see https://github.com/go-gitea/gitea/pull/14762#issuecomment-829224656 + +# Prepare git folder +mkdir -p ${HOME} && chmod 0700 ${HOME} +if [ ! -w ${HOME} ]; then echo "${HOME} is not writable"; exit 1; fi + +# Prepare custom folder +mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} + +# Prepare temp folder +mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} +if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi -- 2.47.2 From 0f43efe952b29b8eacff27c668cce001d93ce106 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 15:29:05 +0200 Subject: [PATCH 142/304] Hack the setup script and drop paths config --- abra.sh | 1 + app.ini.tmpl | 9 --------- compose.yml | 7 +++++++ docker-setup.sh.tmpl | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 docker-setup.sh.tmpl diff --git a/abra.sh b/abra.sh index 6102af0..bc03d58 100644 --- a/abra.sh +++ b/abra.sh @@ -1 +1,2 @@ export APP_INI_VERSION=v5 +export DOCKER_SETUP_SH_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 5989357..82dd588 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -24,10 +24,8 @@ DEFAULT_BRANCH = main STARTUP_TIMEOUT = 0 [server] -APP_DATA_PATH = /data/gitea DOMAIN = {{ env "GITEA_DOMAIN" }} LANDING_PAGE = organizations -LFS_CONTENT_PATH = /data/gitea/lfs ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} @@ -58,10 +56,3 @@ ENABLED = true FILE_EXTENSIONS = .rst RENDER_COMMAND = rst2html IS_INPUT_FILE = false - -[picture] -AVATAR_UPLOAD_PATH = /data/gitea/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars - -[attachment] -PATH = /data/gitea/attachments diff --git a/compose.yml b/compose.yml index 5552798..cabcb8a 100644 --- a/compose.yml +++ b/compose.yml @@ -5,6 +5,9 @@ services: configs: - source: app_ini target: /etc/gitea/app.ini + - source: docker_setup_sh + target: /usr/local/bin/docker-setup.sh + mode: 0555 secrets: - db_password - internal_token @@ -79,6 +82,10 @@ configs: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} file: app.ini.tmpl template_driver: golang + docker_setup_sh: + name: ${STACK_NAME}_docker_setup_sh_${DOCKER_SETUP_SH_VERSION} + file: docker-setup.sh.tmpl + template_driver: golang secrets: db_password: name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl new file mode 100644 index 0000000..310e8f7 --- /dev/null +++ b/docker-setup.sh.tmpl @@ -0,0 +1,15 @@ +#!/bin/bash + +# modified version of https://github.com/go-gitea/gitea/blob/d7dbe4feebac7805a4ca184f0989f58de8063d96/docker/rootless/usr/local/bin/docker-setup.sh +# also see https://github.com/go-gitea/gitea/pull/14762#issuecomment-829224656 + +# Prepare git folder +mkdir -p ${HOME} && chmod 0700 ${HOME} +if [ ! -w ${HOME} ]; then echo "${HOME} is not writable"; exit 1; fi + +# Prepare custom folder +mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} + +# Prepare temp folder +mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} +if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi -- 2.47.2 From e7870c60de398de8b7f175ca578a8ccb176a7752 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 15:38:49 +0200 Subject: [PATCH 143/304] Bump latest config version --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index bc03d58..5fd21ee 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export APP_INI_VERSION=v5 +export APP_INI_VERSION=v6 export DOCKER_SETUP_SH_VERSION=v1 -- 2.47.2 From 7c925037735f0c33dcb2af935d3e5ba7eb143335 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 15:38:49 +0200 Subject: [PATCH 144/304] Bump latest config version --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index bc03d58..5fd21ee 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export APP_INI_VERSION=v5 +export APP_INI_VERSION=v6 export DOCKER_SETUP_SH_VERSION=v1 -- 2.47.2 From 5da44165a4ea8afe27b0b30acfc70948b414b4df Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:02:48 +0200 Subject: [PATCH 145/304] Use new reverse proxy settings --- abra.sh | 2 +- app.ini.tmpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 5fd21ee..b153cf2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export APP_INI_VERSION=v6 +export APP_INI_VERSION=v7 export DOCKER_SETUP_SH_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 82dd588..c3a80c9 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -35,6 +35,8 @@ START_SSH_SERVER = true [security] INSTALL_LOCK = true INTERNAL_TOKEN = {{ secret "internal_token" }} +REVERSE_PROXY_LIMIT = 1 +REVERSE_PROXY_TRUSTED_PROXIES = * SECRET_KEY = {{ secret "secret_key" }} [oauth2] -- 2.47.2 From bff964064cad05da3186f7d72ddf90bd02f61f04 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:02:48 +0200 Subject: [PATCH 146/304] Use new reverse proxy settings --- abra.sh | 2 +- app.ini.tmpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 5fd21ee..b153cf2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ -export APP_INI_VERSION=v6 +export APP_INI_VERSION=v7 export DOCKER_SETUP_SH_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 82dd588..c3a80c9 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -35,6 +35,8 @@ START_SSH_SERVER = true [security] INSTALL_LOCK = true INTERNAL_TOKEN = {{ secret "internal_token" }} +REVERSE_PROXY_LIMIT = 1 +REVERSE_PROXY_TRUSTED_PROXIES = * SECRET_KEY = {{ secret "secret_key" }} [oauth2] -- 2.47.2 From e7e9cf65ae0acdba31aeb5c338050aacaef1b235 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:05:21 +0200 Subject: [PATCH 147/304] Install curl into the image as well --- abra.sh | 2 +- docker-setup.sh.tmpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index b153cf2..06817de 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export APP_INI_VERSION=v7 -export DOCKER_SETUP_SH_VERSION=v1 +export DOCKER_SETUP_SH_VERSION=v2 diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl index 310e8f7..abea632 100644 --- a/docker-setup.sh.tmpl +++ b/docker-setup.sh.tmpl @@ -13,3 +13,5 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} # Prepare temp folder mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi + +apk add --no-cache curl -- 2.47.2 From c4154c867381ce47f90b691832fd6e3051f83474 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:05:21 +0200 Subject: [PATCH 148/304] Install curl into the image as well --- abra.sh | 2 +- docker-setup.sh.tmpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index b153cf2..06817de 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export APP_INI_VERSION=v7 -export DOCKER_SETUP_SH_VERSION=v1 +export DOCKER_SETUP_SH_VERSION=v2 diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl index 310e8f7..abea632 100644 --- a/docker-setup.sh.tmpl +++ b/docker-setup.sh.tmpl @@ -13,3 +13,5 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} # Prepare temp folder mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi + +apk add --no-cache curl -- 2.47.2 From 3f7bb4e6a1c2982a2ecaf793495792d24aa1d688 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:12:14 +0200 Subject: [PATCH 149/304] Don't run installs here See https://github.com/go-gitea/gitea/issues/15661. --- abra.sh | 2 +- docker-setup.sh.tmpl | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index 06817de..b153cf2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export APP_INI_VERSION=v7 -export DOCKER_SETUP_SH_VERSION=v2 +export DOCKER_SETUP_SH_VERSION=v1 diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl index abea632..310e8f7 100644 --- a/docker-setup.sh.tmpl +++ b/docker-setup.sh.tmpl @@ -13,5 +13,3 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} # Prepare temp folder mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi - -apk add --no-cache curl -- 2.47.2 From 036f070dc46fadf5c9bd40b5df9d1e7a0ae2ef5b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:12:14 +0200 Subject: [PATCH 150/304] Don't run installs here See https://github.com/go-gitea/gitea/issues/15661. --- abra.sh | 2 +- docker-setup.sh.tmpl | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/abra.sh b/abra.sh index 06817de..b153cf2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export APP_INI_VERSION=v7 -export DOCKER_SETUP_SH_VERSION=v2 +export DOCKER_SETUP_SH_VERSION=v1 diff --git a/docker-setup.sh.tmpl b/docker-setup.sh.tmpl index abea632..310e8f7 100644 --- a/docker-setup.sh.tmpl +++ b/docker-setup.sh.tmpl @@ -13,5 +13,3 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM} # Prepare temp folder mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP} if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi - -apk add --no-cache curl -- 2.47.2 From 21cc6d897167e1f1b7223cc2ff1ae18dbbe9c461 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:12:26 +0200 Subject: [PATCH 151/304] Disable healthcheck for now See https://github.com/go-gitea/gitea/issues/15661 --- compose.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index cabcb8a..6695e44 100644 --- a/compose.yml +++ b/compose.yml @@ -35,12 +35,13 @@ services: networks: - proxy - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:3000"] - interval: 15s - timeout: 10s - retries: 10 - start_period: 30s + # Disabled for now, see https://github.com/go-gitea/gitea/issues/15661 + # healthcheck: + # test: ["CMD", "curl", "-f", "http://localhost:3000"] + # interval: 15s + # timeout: 10s + # retries: 10 + # start_period: 30s deploy: update_config: failure_action: rollback -- 2.47.2 From 99cde9cec37985a8e6cc311996961db386c0f32c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 16:12:26 +0200 Subject: [PATCH 152/304] Disable healthcheck for now See https://github.com/go-gitea/gitea/issues/15661 --- compose.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/compose.yml b/compose.yml index cabcb8a..6695e44 100644 --- a/compose.yml +++ b/compose.yml @@ -35,12 +35,13 @@ services: networks: - proxy - internal - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:3000"] - interval: 15s - timeout: 10s - retries: 10 - start_period: 30s + # Disabled for now, see https://github.com/go-gitea/gitea/issues/15661 + # healthcheck: + # test: ["CMD", "curl", "-f", "http://localhost:3000"] + # interval: 15s + # timeout: 10s + # retries: 10 + # start_period: 30s deploy: update_config: failure_action: rollback -- 2.47.2 From 7229c67cf4fc66bda44a6497997eeb95b540edb3 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:11:54 +0200 Subject: [PATCH 153/304] Add missing env var and sort --- .drone.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d5e269d..782d7cf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,9 +12,9 @@ steps: deploy_key: from_secret: drone_ssh_swarm_test environment: + APP_INI_VERSION: v1 + DOCKER_SETUP_SH_VERSION: v1 DOMAIN: gitea.swarm-test.autonomic.zone - STACK_NAME: gitea - LETS_ENCRYPT_ENV: production GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true GITEA_APP_NAME: Git with solidaritea GITEA_AUTO_WATCH_NEW_REPOS: false @@ -23,14 +23,15 @@ steps: GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true - GITEA_SSH_PORT: 2222 GITEA_SSH_ENABLED: 1 - APP_INI_VERSION: v1 + GITEA_SSH_PORT: 2222 + LETS_ENCRYPT_ENV: production SECRET_DB_PASSWORD_VERSION: v1 SECRET_DB_ROOT_PASSWORD_VERSION: v1 SECRET_INTERNAL_TOKEN_VERSION: v1 SECRET_JWT_SECRET_VERSION: v1 SECRET_SECRET_KEY_VERSION: v1 + STACK_NAME: gitea trigger: branch: - master -- 2.47.2 From 451cb36d5df961ad60da87123529187098c249c8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:11:54 +0200 Subject: [PATCH 154/304] Add missing env var and sort --- .drone.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index d5e269d..782d7cf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,9 +12,9 @@ steps: deploy_key: from_secret: drone_ssh_swarm_test environment: + APP_INI_VERSION: v1 + DOCKER_SETUP_SH_VERSION: v1 DOMAIN: gitea.swarm-test.autonomic.zone - STACK_NAME: gitea - LETS_ENCRYPT_ENV: production GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true GITEA_APP_NAME: Git with solidaritea GITEA_AUTO_WATCH_NEW_REPOS: false @@ -23,14 +23,15 @@ steps: GITEA_ENABLE_NOTIFY_MAIL: false GITEA_ENABLE_OPENID_SIGNIN: true GITEA_ENABLE_OPENID_SIGNUP: true - GITEA_SSH_PORT: 2222 GITEA_SSH_ENABLED: 1 - APP_INI_VERSION: v1 + GITEA_SSH_PORT: 2222 + LETS_ENCRYPT_ENV: production SECRET_DB_PASSWORD_VERSION: v1 SECRET_DB_ROOT_PASSWORD_VERSION: v1 SECRET_INTERNAL_TOKEN_VERSION: v1 SECRET_JWT_SECRET_VERSION: v1 SECRET_SECRET_KEY_VERSION: v1 + STACK_NAME: gitea trigger: branch: - master -- 2.47.2 From c7bfd02be9cd3442fdfabe69534cbcc1117fd27f Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:15:50 +0200 Subject: [PATCH 155/304] Pass in conditional env var --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 6695e44..f3146ce 100644 --- a/compose.yml +++ b/compose.yml @@ -26,6 +26,7 @@ services: - GITEA_ENABLE_NOTIFY_MAIL - GITEA_ENABLE_OPENID_SIGNIN - GITEA_ENABLE_OPENID_SIGNUP + - GITEA_SMTP_MAILER_ENABLED - GITEA_SSH_PORT volumes: - data:/var/lib/gitea -- 2.47.2 From 4e97cae1fd37b8da78a70b4492396021a7c329f9 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:15:50 +0200 Subject: [PATCH 156/304] Pass in conditional env var --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 6695e44..f3146ce 100644 --- a/compose.yml +++ b/compose.yml @@ -26,6 +26,7 @@ services: - GITEA_ENABLE_NOTIFY_MAIL - GITEA_ENABLE_OPENID_SIGNIN - GITEA_ENABLE_OPENID_SIGNUP + - GITEA_SMTP_MAILER_ENABLED - GITEA_SSH_PORT volumes: - data:/var/lib/gitea -- 2.47.2 From 2a23112f1aa304fd7e3a68d153208e52264748d4 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:18:30 +0200 Subject: [PATCH 157/304] Fix typo --- compose.smtp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.smtp.yml b/compose.smtp.yml index a0b57c8..24e9879 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -8,6 +8,6 @@ services: secrets: - smtp_password secrets: - smtp_passord: + smtp_password: name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} external: true -- 2.47.2 From 2550b92b7ac466e2187773a450d8b7d244c6524b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 29 Apr 2021 17:18:30 +0200 Subject: [PATCH 158/304] Fix typo --- compose.smtp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.smtp.yml b/compose.smtp.yml index a0b57c8..24e9879 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -8,6 +8,6 @@ services: secrets: - smtp_password secrets: - smtp_passord: + smtp_password: name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} external: true -- 2.47.2 From 9198138409d8ed671c7a8f3b4f57705c78ec7e83 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 Apr 2021 07:01:30 +0000 Subject: [PATCH 159/304] Update mariadb Docker tag to v10.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index f3146ce..74cffaa 100644 --- a/compose.yml +++ b/compose.yml @@ -58,7 +58,7 @@ services: - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc db: - image: "mariadb:10.5" + image: "mariadb:10.6" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: -- 2.47.2 From f29e86bc1010fed2412b981f313176b1f6c30ee8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 30 Apr 2021 07:01:30 +0000 Subject: [PATCH 160/304] Update mariadb Docker tag to v10.6 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index f3146ce..74cffaa 100644 --- a/compose.yml +++ b/compose.yml @@ -58,7 +58,7 @@ services: - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc db: - image: "mariadb:10.5" + image: "mariadb:10.6" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: -- 2.47.2 From a344088323773ce075860d8e034042ebe836417a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 3 May 2021 09:28:43 +0200 Subject: [PATCH 161/304] Version 1.14.1-rootless_1; sync labels Point release for the mariadb container. --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 74cffaa..84c7038 100644 --- a/compose.yml +++ b/compose.yml @@ -74,7 +74,7 @@ services: networks: - internal deploy: - labels: ["coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef"] + labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: proxy: -- 2.47.2 From 590c3af6f931b967e0d0bbe5db0c7c9f63bbd59d Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 3 May 2021 09:28:43 +0200 Subject: [PATCH 162/304] Version 1.14.1-rootless_1; sync labels Point release for the mariadb container. --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 74cffaa..84c7038 100644 --- a/compose.yml +++ b/compose.yml @@ -74,7 +74,7 @@ services: networks: - internal deploy: - labels: ["coop-cloud.${STACK_NAME}.db.version=10.5-9c681cef"] + labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: proxy: -- 2.47.2 From 523be9cd9a719524ca672edad3eb3cab7b0cc980 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 7 May 2021 00:33:51 +0200 Subject: [PATCH 163/304] Drop commented config for now --- compose.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/compose.yml b/compose.yml index 84c7038..e873644 100644 --- a/compose.yml +++ b/compose.yml @@ -36,13 +36,6 @@ services: networks: - proxy - internal - # Disabled for now, see https://github.com/go-gitea/gitea/issues/15661 - # healthcheck: - # test: ["CMD", "curl", "-f", "http://localhost:3000"] - # interval: 15s - # timeout: 10s - # retries: 10 - # start_period: 30s deploy: update_config: failure_action: rollback -- 2.47.2 From 13997ed6713b5505c7413834d53a50b3e9faa751 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 7 May 2021 00:33:51 +0200 Subject: [PATCH 164/304] Drop commented config for now --- compose.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/compose.yml b/compose.yml index 84c7038..e873644 100644 --- a/compose.yml +++ b/compose.yml @@ -36,13 +36,6 @@ services: networks: - proxy - internal - # Disabled for now, see https://github.com/go-gitea/gitea/issues/15661 - # healthcheck: - # test: ["CMD", "curl", "-f", "http://localhost:3000"] - # interval: 15s - # timeout: 10s - # retries: 10 - # start_period: 30s deploy: update_config: failure_action: rollback -- 2.47.2 From 8b5767fd6c4f4282815d3da789e9991653e477be Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 10 May 2021 07:01:26 +0000 Subject: [PATCH 165/304] Update gitea/gitea Docker tag to v1.14.2 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e873644..9d6d080 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.1-rootless" + image: "gitea/gitea:1.14.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From b8cf1bed7bfd9aaab0fefdc92c4094b3e1c42643 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 10 May 2021 07:01:26 +0000 Subject: [PATCH 166/304] Update gitea/gitea Docker tag to v1.14.2 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e873644..9d6d080 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.1-rootless" + image: "gitea/gitea:1.14.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 5447973848715bea25d62c7fedfce33c0f1c303f Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 10 May 2021 10:06:13 +0200 Subject: [PATCH 167/304] Version 1.14.2-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 9d6d080..80e53c3 100644 --- a/compose.yml +++ b/compose.yml @@ -49,7 +49,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc + - coop-cloud.${STACK_NAME}.app.version=1.14.2-rootless-bedf8d12 db: image: "mariadb:10.6" command: | -- 2.47.2 From ba05cf5557d27fb83de37b97433246721979b71b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 10 May 2021 10:06:13 +0200 Subject: [PATCH 168/304] Version 1.14.2-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 9d6d080..80e53c3 100644 --- a/compose.yml +++ b/compose.yml @@ -49,7 +49,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.1-rootless-6244e9fc + - coop-cloud.${STACK_NAME}.app.version=1.14.2-rootless-bedf8d12 db: image: "mariadb:10.6" command: | -- 2.47.2 From 6d02663ddd8771f4fcd5cb77bbe0cb3bbf934ceb Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 23:00:40 +0200 Subject: [PATCH 169/304] Add release logic to CI [ci skip] --- .drone.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.drone.yml b/.drone.yml index 782d7cf..71f97f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,3 +35,16 @@ steps: trigger: branch: - master +--- +kind: pipeline +name: recipe release +steps: + - name: release a new version + image: decentral1se/drone-abra:latest + settings: + command: recipe matrix-synapse release + deploy_key: + from_secret: abra_bot_deploy_key +trigger: + event: + - tag -- 2.47.2 From 73b993a654c6476bc3a3c6805ad22a70590e593f Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 23:00:40 +0200 Subject: [PATCH 170/304] Add release logic to CI [ci skip] --- .drone.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.drone.yml b/.drone.yml index 782d7cf..71f97f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,3 +35,16 @@ steps: trigger: branch: - master +--- +kind: pipeline +name: recipe release +steps: + - name: release a new version + image: decentral1se/drone-abra:latest + settings: + command: recipe matrix-synapse release + deploy_key: + from_secret: abra_bot_deploy_key +trigger: + event: + - tag -- 2.47.2 From 0bd049d6bcd293c4c081299a4336d083f7d2503c Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 23:06:30 +0200 Subject: [PATCH 171/304] Fix bad name in batch update script [ci skip] --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 71f97f4..9aa6673 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ steps: - name: release a new version image: decentral1se/drone-abra:latest settings: - command: recipe matrix-synapse release + command: recipe gitea release deploy_key: from_secret: abra_bot_deploy_key trigger: -- 2.47.2 From 5ba392d9a35d3b865039b31254dbb0ac85a4054d Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 23:06:30 +0200 Subject: [PATCH 172/304] Fix bad name in batch update script [ci skip] --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 71f97f4..9aa6673 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ steps: - name: release a new version image: decentral1se/drone-abra:latest settings: - command: recipe matrix-synapse release + command: recipe gitea release deploy_key: from_secret: abra_bot_deploy_key trigger: -- 2.47.2 From e49462ed9244b98199a0f1bc201da8b14daf5552 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 4 Jun 2021 00:14:31 +0200 Subject: [PATCH 173/304] Remove trigger, we make the tags [ci skip] --- .drone.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9aa6673..145828d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,6 +45,3 @@ steps: command: recipe gitea release deploy_key: from_secret: abra_bot_deploy_key -trigger: - event: - - tag -- 2.47.2 From 903bbfd1084c701dbad6b49805ba8f40cefc5953 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 4 Jun 2021 00:14:31 +0200 Subject: [PATCH 174/304] Remove trigger, we make the tags [ci skip] --- .drone.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9aa6673..145828d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,6 +45,3 @@ steps: command: recipe gitea release deploy_key: from_secret: abra_bot_deploy_key -trigger: - event: - - tag -- 2.47.2 From b7ce009022ddb9bf77d95d49bd3d9b45877e01c3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 21 Jun 2021 07:01:16 +0000 Subject: [PATCH 175/304] Update gitea/gitea Docker tag to v1.14.3 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 80e53c3..c063807 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.2-rootless" + image: "gitea/gitea:1.14.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 6956f143e9001f3e0dad6deec8233f452449fa6d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 21 Jun 2021 07:01:16 +0000 Subject: [PATCH 176/304] Update gitea/gitea Docker tag to v1.14.3 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 80e53c3..c063807 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.2-rootless" + image: "gitea/gitea:1.14.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 28790adc409435332688865263991d37e0fe0a5a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 21 Jun 2021 12:28:33 +0200 Subject: [PATCH 177/304] Use new image namespace --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 145828d..868beb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ kind: pipeline name: recipe release steps: - name: release a new version - image: decentral1se/drone-abra:latest + image: thecoopcloud/drone-abra:latest settings: command: recipe gitea release deploy_key: -- 2.47.2 From 0cae142936935c6868275476ee817394b38d883f Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 21 Jun 2021 12:28:33 +0200 Subject: [PATCH 178/304] Use new image namespace --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 145828d..868beb0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ kind: pipeline name: recipe release steps: - name: release a new version - image: decentral1se/drone-abra:latest + image: thecoopcloud/drone-abra:latest settings: command: recipe gitea release deploy_key: -- 2.47.2 From e79945fd1ab494f865dd73d1248286cdf1fd4293 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 21 Jun 2021 12:46:39 +0200 Subject: [PATCH 179/304] Version 1.14.3-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c063807..39d8954 100644 --- a/compose.yml +++ b/compose.yml @@ -49,7 +49,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.2-rootless-bedf8d12 + - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d db: image: "mariadb:10.6" command: | -- 2.47.2 From 51d14ce545045fd3ea7c3ecddd59bbab29ef9449 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 21 Jun 2021 12:46:39 +0200 Subject: [PATCH 180/304] Version 1.14.3-rootless; sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index c063807..39d8954 100644 --- a/compose.yml +++ b/compose.yml @@ -49,7 +49,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.2-rootless-bedf8d12 + - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d db: image: "mariadb:10.6" command: | -- 2.47.2 From 0ced73cda6741e613fe1b2d8e092f142d11b334f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 Jul 2021 07:01:29 +0000 Subject: [PATCH 181/304] Update gitea/gitea Docker tag to v1.14.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 39d8954..903d3a7 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.3-rootless" + image: "gitea/gitea:1.14.4-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 9f61417eca45e04781e91ac1a35c8075011f29a2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 Jul 2021 07:01:29 +0000 Subject: [PATCH 182/304] Update gitea/gitea Docker tag to v1.14.4 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 39d8954..903d3a7 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.3-rootless" + image: "gitea/gitea:1.14.4-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 97510c9a15af6a21134ae33763a955590aa74dec Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 10 Jul 2021 15:41:11 +0200 Subject: [PATCH 183/304] Scope internal network internally --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 903d3a7..17225d8 100644 --- a/compose.yml +++ b/compose.yml @@ -70,6 +70,7 @@ services: labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: + internal: true proxy: external: true configs: -- 2.47.2 From 31d2d2b0c25d6456844142453e930eab36a35f77 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 10 Jul 2021 15:41:11 +0200 Subject: [PATCH 184/304] Scope internal network internally --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index 903d3a7..17225d8 100644 --- a/compose.yml +++ b/compose.yml @@ -70,6 +70,7 @@ services: labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: + internal: true proxy: external: true configs: -- 2.47.2 From a199d5b1ff026853017f597ea1dda11f00715c49 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 15 Jul 2021 16:08:32 +0200 Subject: [PATCH 185/304] Revert internal network change (see https://git.autonomic.zone/coop-cloud/organising/issues/62) --- compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose.yml b/compose.yml index 17225d8..903d3a7 100644 --- a/compose.yml +++ b/compose.yml @@ -70,7 +70,6 @@ services: labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: - internal: true proxy: external: true configs: -- 2.47.2 From 945602a70dd19e1c33675f283b4f5881353dd0dd Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 15 Jul 2021 16:08:32 +0200 Subject: [PATCH 186/304] Revert internal network change (see https://git.autonomic.zone/coop-cloud/organising/issues/62) --- compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose.yml b/compose.yml index 17225d8..903d3a7 100644 --- a/compose.yml +++ b/compose.yml @@ -70,7 +70,6 @@ services: labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] networks: internal: - internal: true proxy: external: true configs: -- 2.47.2 From 818d474b43aacd0a2073be0f6dfcd9e758a69aa6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 19 Jul 2021 07:01:48 +0000 Subject: [PATCH 187/304] Update gitea/gitea Docker tag to v1.14.5 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 903d3a7..06b6d86 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.4-rootless" + image: "gitea/gitea:1.14.5-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 969ce90b8ac847ef44bb68bfd774b515735ea4a1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 19 Jul 2021 07:01:48 +0000 Subject: [PATCH 188/304] Update gitea/gitea Docker tag to v1.14.5 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 903d3a7..06b6d86 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.4-rootless" + image: "gitea/gitea:1.14.5-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From afb6ec42a3cfdea17580ac202662e45603aba57d Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:41:16 +0200 Subject: [PATCH 189/304] chore: more spacing --- compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose.yml b/compose.yml index 06b6d86..3cee580 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: image: "gitea/gitea:1.14.5-rootless" @@ -50,6 +52,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d + db: image: "mariadb:10.6" command: | @@ -72,6 +75,7 @@ networks: internal: proxy: external: true + configs: app_ini: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} @@ -81,6 +85,7 @@ configs: name: ${STACK_NAME}_docker_setup_sh_${DOCKER_SETUP_SH_VERSION} file: docker-setup.sh.tmpl template_driver: golang + secrets: db_password: name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} @@ -97,6 +102,7 @@ secrets: secret_key: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true + volumes: data: config: -- 2.47.2 From 8ccf9ce8832a8147712f1663cf8736c0234309f7 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:41:16 +0200 Subject: [PATCH 190/304] chore: more spacing --- compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose.yml b/compose.yml index 06b6d86..3cee580 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: image: "gitea/gitea:1.14.5-rootless" @@ -50,6 +52,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d + db: image: "mariadb:10.6" command: | @@ -72,6 +75,7 @@ networks: internal: proxy: external: true + configs: app_ini: name: ${STACK_NAME}_app_ini_${APP_INI_VERSION} @@ -81,6 +85,7 @@ configs: name: ${STACK_NAME}_docker_setup_sh_${DOCKER_SETUP_SH_VERSION} file: docker-setup.sh.tmpl template_driver: golang + secrets: db_password: name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} @@ -97,6 +102,7 @@ secrets: secret_key: name: ${STACK_NAME}_secret_key_${SECRET_SECRET_KEY_VERSION} external: true + volumes: data: config: -- 2.47.2 From fbd8da1aa6f598399cd0569712cde4e4dd694c55 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:41:28 +0200 Subject: [PATCH 191/304] fix: drop label on non-app service Experimenting with new versioning scheme. --- compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3cee580..8ce5abe 100644 --- a/compose.yml +++ b/compose.yml @@ -69,8 +69,7 @@ services: - "mariadb:/var/lib/mysql" networks: - internal - deploy: - labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] + networks: internal: proxy: -- 2.47.2 From e33bde6f4db4df91b696c731f33543a1debb6f4a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:41:28 +0200 Subject: [PATCH 192/304] fix: drop label on non-app service Experimenting with new versioning scheme. --- compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3cee580..8ce5abe 100644 --- a/compose.yml +++ b/compose.yml @@ -69,8 +69,7 @@ services: - "mariadb:/var/lib/mysql" networks: - internal - deploy: - labels: ['coop-cloud.${STACK_NAME}.db.version=10.6-718cb856'] + networks: internal: proxy: -- 2.47.2 From 36a777110afd465903dd1d04abfc7d00779d1f3b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:42:10 +0200 Subject: [PATCH 193/304] chore: formatting --- compose.smtp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.smtp.yml b/compose.smtp.yml index 24e9879..c0cf31d 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: environment: @@ -7,6 +9,7 @@ services: - GITEA_MAILER_USER secrets: - smtp_password + secrets: smtp_password: name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} -- 2.47.2 From ea7fa4e84c5f5648badd953f05fe343d06e9dea8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:42:10 +0200 Subject: [PATCH 194/304] chore: formatting --- compose.smtp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose.smtp.yml b/compose.smtp.yml index 24e9879..c0cf31d 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: app: environment: @@ -7,6 +9,7 @@ services: - GITEA_MAILER_USER secrets: - smtp_password + secrets: smtp_password: name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION} -- 2.47.2 From c033ab148df27403ea6b328d34632e0604dbfcda Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:42:53 +0200 Subject: [PATCH 195/304] docs: new URLs and auto-format --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 94d92b4..9230061 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,18 @@ # Gitea -[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) +[![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) -* **Category**: Development -* **Status**: ❷💛 -* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream -* **Healthcheck**: Yes -* **Backups**: No -* **Email**: ? -* **Tests**: ❷💛 -* **SSO**: ❶💚 (OAuth) + +- **Category**: Development +- **Status**: ❷💛 +- **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +- **Healthcheck**: Yes +- **Backups**: No +- **Email**: ? +- **Tests**: ❷💛 +- **SSO**: ❶💚 (OAuth) + ## Basic usage -- 2.47.2 From 208d411f9cd03726e5e0f261fd835a632aa57f8e Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:42:53 +0200 Subject: [PATCH 196/304] docs: new URLs and auto-format --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 94d92b4..9230061 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,18 @@ # Gitea -[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/gitea/status.svg)](https://drone.autonomic.zone/coop-cloud/gitea) +[![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) -* **Category**: Development -* **Status**: ❷💛 -* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream -* **Healthcheck**: Yes -* **Backups**: No -* **Email**: ? -* **Tests**: ❷💛 -* **SSO**: ❶💚 (OAuth) + +- **Category**: Development +- **Status**: ❷💛 +- **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +- **Healthcheck**: Yes +- **Backups**: No +- **Email**: ? +- **Tests**: ❷💛 +- **SSO**: ❶💚 (OAuth) + ## Basic usage -- 2.47.2 From 52295ad8fe36c751f9a370544eae71375f8f1518 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:43:05 +0200 Subject: [PATCH 197/304] chore: drop old automation file --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 39a2b6e..0000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} -- 2.47.2 From f6f9590cfeb28ed12c7b1c698f1795f35fd1d0c8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 09:43:05 +0200 Subject: [PATCH 198/304] chore: drop old automation file --- renovate.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 39a2b6e..0000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -} -- 2.47.2 From 4e1ef6af540fe58b40f62685b0d4a5b26cf141dc Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 20:55:00 +0200 Subject: [PATCH 199/304] docs: use new version scheme [ci skip] --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8ce5abe..424228b 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d + - coop-cloud.${STACK_NAME}.version=1.0.0+1.14.5-rootless db: image: "mariadb:10.6" -- 2.47.2 From 761ce25ccbb8c52a661567394a2d06a1434ad683 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 5 Oct 2021 20:55:00 +0200 Subject: [PATCH 200/304] docs: use new version scheme [ci skip] --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 8ce5abe..424228b 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.app.version=1.14.3-rootless-597e2e5d + - coop-cloud.${STACK_NAME}.version=1.0.0+1.14.5-rootless db: image: "mariadb:10.6" -- 2.47.2 From 7ac75d3224e6a41671b123334d0a7c18fa62af74 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:02:27 +0200 Subject: [PATCH 201/304] chore: bump to v15 for gitea --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 424228b..792c665 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.5-rootless" + image: "gitea/gitea:1.15.0-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 1aa71afcf61db0479452ae06f7d12079c109f61b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:02:27 +0200 Subject: [PATCH 202/304] chore: bump to v15 for gitea --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 424228b..792c665 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.14.5-rootless" + image: "gitea/gitea:1.15.0-rootless" configs: - source: app_ini target: /etc/gitea/app.ini -- 2.47.2 From 5f734e2c81bd7b80e4160215572c2a876857f5a5 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:22:33 +0200 Subject: [PATCH 203/304] chore: sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 792c665..4a892d8 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.0.0+1.14.5-rootless + - coop-cloud.${STACK_NAME}.version=1.1.0+1.15.0-rootless db: image: "mariadb:10.6" -- 2.47.2 From 632364fccf327a50c90b6c9e58235d4f2e24d3c0 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:22:33 +0200 Subject: [PATCH 204/304] chore: sync labels --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 792c665..4a892d8 100644 --- a/compose.yml +++ b/compose.yml @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.0.0+1.14.5-rootless + - coop-cloud.${STACK_NAME}.version=1.1.0+1.15.0-rootless db: image: "mariadb:10.6" -- 2.47.2 From b1e3296a0ed7148dcff1d6161ae72f2821dcfd6b Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:43:16 +0200 Subject: [PATCH 205/304] chore: bump patch version --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 4a892d8..763964e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.0-rootless" + image: "gitea/gitea:1.15.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.0+1.15.0-rootless + - coop-cloud.${STACK_NAME}.version=1.1.1+1.15.3-rootless db: image: "mariadb:10.6" -- 2.47.2 From 05473366989941d50c2d9a11d3467966f0013c07 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Fri, 8 Oct 2021 09:43:16 +0200 Subject: [PATCH 206/304] chore: bump patch version --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 4a892d8..763964e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.0-rootless" + image: "gitea/gitea:1.15.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.0+1.15.0-rootless + - coop-cloud.${STACK_NAME}.version=1.1.1+1.15.3-rootless db: image: "mariadb:10.6" -- 2.47.2 From a78a425d5806cb8101cf42648e69dbc583176f18 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 2 Nov 2021 21:45:37 +0100 Subject: [PATCH 207/304] chore: release patch version --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 763964e..fd7e02e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.3-rootless" + image: "gitea/gitea:1.15.6-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.1+1.15.3-rootless + - coop-cloud.${STACK_NAME}.version=1.1.2+1.15.6-rootless db: image: "mariadb:10.6" -- 2.47.2 From 7009473b38e0eebcaf1add865c5ccbe11b64a554 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 2 Nov 2021 21:45:37 +0100 Subject: [PATCH 208/304] chore: release patch version --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 763964e..fd7e02e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.3-rootless" + image: "gitea/gitea:1.15.6-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.1+1.15.3-rootless + - coop-cloud.${STACK_NAME}.version=1.1.2+1.15.6-rootless db: image: "mariadb:10.6" -- 2.47.2 From 6a63f8a0bc955f0ae7848841ee6c7dffc0db9014 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 18 Aug 2021 03:02:06 +0200 Subject: [PATCH 209/304] Add preliminary backups --- abra.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/abra.sh b/abra.sh index b153cf2..8b96d81 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,14 @@ export APP_INI_VERSION=v7 export DOCKER_SETUP_SH_VERSION=v1 + +abra_backup_app() { + _abra_backup_dir "app:/var/lib/gitea" +} + +abra_backup_db() { + _abra_backup_mysql "db" "gitea" +} + +abra_backup() { + abra_backup_app && abra_backup_db +} -- 2.47.2 From d0488d3a617dcf303c061463db2de9c261543728 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 18 Aug 2021 03:02:06 +0200 Subject: [PATCH 210/304] Add preliminary backups --- abra.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/abra.sh b/abra.sh index b153cf2..8b96d81 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,14 @@ export APP_INI_VERSION=v7 export DOCKER_SETUP_SH_VERSION=v1 + +abra_backup_app() { + _abra_backup_dir "app:/var/lib/gitea" +} + +abra_backup_db() { + _abra_backup_mysql "db" "gitea" +} + +abra_backup() { + abra_backup_app && abra_backup_db +} -- 2.47.2 From deb00dcd6461436a916f42fa648676ebd45e6b3d Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 18 Aug 2021 03:03:27 +0200 Subject: [PATCH 211/304] Update metadata [ci skip] --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9230061..23736cd 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,14 @@ [![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) - - **Category**: Development -- **Status**: ❷💛 +* **Status**: ❶💚 - **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream - **Healthcheck**: Yes -- **Backups**: No +* **Backups**: Yes - **Email**: ? - **Tests**: ❷💛 - **SSO**: ❶💚 (OAuth) - ## Basic usage -- 2.47.2 From ee34764179dfc83dd60c4b0086a47a9e4022db39 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 18 Aug 2021 03:03:27 +0200 Subject: [PATCH 212/304] Update metadata [ci skip] --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9230061..23736cd 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,14 @@ [![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) - - **Category**: Development -- **Status**: ❷💛 +* **Status**: ❶💚 - **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream - **Healthcheck**: Yes -- **Backups**: No +* **Backups**: Yes - **Email**: ? - **Tests**: ❷💛 - **SSO**: ❶💚 (OAuth) - ## Basic usage -- 2.47.2 From d9455c210f15e7d3438f3b026b11888b77adf461 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 22 Nov 2021 13:42:03 +0200 Subject: [PATCH 213/304] chore: fix README bullet formatting [ci skip] --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 23736cd..ab734d9 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ [![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) -- **Category**: Development +* **Category**: Development * **Status**: ❶💚 -- **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream -- **Healthcheck**: Yes +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Healthcheck**: Yes * **Backups**: Yes -- **Email**: ? -- **Tests**: ❷💛 -- **SSO**: ❶💚 (OAuth) +* **Email**: ? +* **Tests**: ❷💛 +* **SSO**: ❶💚 (OAuth) ## Basic usage -- 2.47.2 From 83a9e9da6ba6f08cc4e830ec55179949d9151830 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 22 Nov 2021 13:42:03 +0200 Subject: [PATCH 214/304] chore: fix README bullet formatting [ci skip] --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 23736cd..ab734d9 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ [![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) -- **Category**: Development +* **Category**: Development * **Status**: ❶💚 -- **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream -- **Healthcheck**: Yes +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Healthcheck**: Yes * **Backups**: Yes -- **Email**: ? -- **Tests**: ❷💛 -- **SSO**: ❶💚 (OAuth) +* **Email**: ? +* **Tests**: ❷💛 +* **SSO**: ❶💚 (OAuth) ## Basic usage -- 2.47.2 From 0ce3933fce90ad5372e9eb1df8388923b348e9db Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 23 Nov 2021 12:19:04 +0200 Subject: [PATCH 215/304] =?UTF-8?q?Goodbye,=20emojis!=20=F0=9F=98=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ci skip] --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ab734d9..ec3949b 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ * **Category**: Development -* **Status**: ❶💚 -* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Status**: 3, stable +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream * **Healthcheck**: Yes * **Backups**: Yes * **Email**: ? -* **Tests**: ❷💛 -* **SSO**: ❶💚 (OAuth) +* **Tests**: 2 +* **SSO**: 3 (OAuth) ## Basic usage -- 2.47.2 From fee8fd5342c96a3728e43d0b687e23497b81864f Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 23 Nov 2021 12:19:04 +0200 Subject: [PATCH 216/304] =?UTF-8?q?Goodbye,=20emojis!=20=F0=9F=98=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ci skip] --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ab734d9..ec3949b 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@ * **Category**: Development -* **Status**: ❶💚 -* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), ❶💚, upstream +* **Status**: 3, stable +* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream * **Healthcheck**: Yes * **Backups**: Yes * **Email**: ? -* **Tests**: ❷💛 -* **SSO**: ❶💚 (OAuth) +* **Tests**: 2 +* **SSO**: 3 (OAuth) ## Basic usage -- 2.47.2 From a907b39ea5e4926cbe97938bc7b962dc9d490fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Wed, 29 Dec 2021 18:13:43 +0100 Subject: [PATCH 217/304] docs(README): instruction to create first user --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index ec3949b..79f1256 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,13 @@ 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box 5. `abra app YOURAPPDOMAIN deploy` + +## Create first user + +Run + +```bash +abra app run git YOURAPPNAME gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL +``` + +See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. -- 2.47.2 From cec9c2c06163b74f6094f9725e60fb794737f821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Wed, 29 Dec 2021 18:13:43 +0100 Subject: [PATCH 218/304] docs(README): instruction to create first user --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index ec3949b..79f1256 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,13 @@ 4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box 5. `abra app YOURAPPDOMAIN deploy` + +## Create first user + +Run + +```bash +abra app run git YOURAPPNAME gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL +``` + +See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. -- 2.47.2 From 199196461e8412721ce4c836a2bc8f1dd7a1c12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Fri, 31 Dec 2021 13:32:40 +0100 Subject: [PATCH 219/304] docs(README): correct command creating new user --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79f1256..af36ce3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Run ```bash -abra app run git YOURAPPNAME gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL +abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL ``` See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. -- 2.47.2 From 741b8701e550380674c69b88a57840e53bd96ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Fri, 31 Dec 2021 13:32:40 +0100 Subject: [PATCH 220/304] docs(README): correct command creating new user --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79f1256..af36ce3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Run ```bash -abra app run git YOURAPPNAME gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL +abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --username USERNAME --admin --random-password --email EMAIL ``` See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. -- 2.47.2 From 975fc775c1131a29cde68d52006f9a8cf3bb02c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Fri, 31 Dec 2021 13:45:28 +0100 Subject: [PATCH 221/304] docs(README): how to enable SSH --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index af36ce3..5f1b5da 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,30 @@ abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --use ``` See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. + +## Enable SSH + +You most certainly want to be able to access your repository over SSH. To do so, make sure you uncomment the right lines in the configuration for `traefik`. +``` +abra app config YOURTRAEFIKAPP +``` +There uncomment or add these lines: +``` +GITEA_SSH_ENABLED=1 +COMPOSE_FILE="compose.yml:compose.gitea.yml" +``` +Then redeploy traefik: +``` +abra app undeploy YOURTRAEFIKAPP +abra app deploy YOURTRAEFIKAPP +``` +You might need to wait a bit. To check if it worked, you can run +``` +telnet my.gitea.example.com 2222 +``` +Once you have added a public SSH key, you can check that you can connect to your gitea server with +``` +ssh -T -p 2222 git@my.gitea.example.com +``` + +Note that gitea should be configured to listen to port 2222, i.e. `GITEA_SSH_PORT=2222` in the gitea config. -- 2.47.2 From b2f29bc99e06191222d1207dd9e0a119875e37b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o?= Date: Fri, 31 Dec 2021 13:45:28 +0100 Subject: [PATCH 222/304] docs(README): how to enable SSH --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index af36ce3..5f1b5da 100644 --- a/README.md +++ b/README.md @@ -32,3 +32,30 @@ abra app run YOURAPPNAME app gitea -c /etc/gitea/app.ini admin user create --use ``` See the [Gitea command-line documentation](https://docs.gitea.io/en-us/command-line/) for more options. Make sure not to forget the `-c /etc/gitea/app.ini`. + +## Enable SSH + +You most certainly want to be able to access your repository over SSH. To do so, make sure you uncomment the right lines in the configuration for `traefik`. +``` +abra app config YOURTRAEFIKAPP +``` +There uncomment or add these lines: +``` +GITEA_SSH_ENABLED=1 +COMPOSE_FILE="compose.yml:compose.gitea.yml" +``` +Then redeploy traefik: +``` +abra app undeploy YOURTRAEFIKAPP +abra app deploy YOURTRAEFIKAPP +``` +You might need to wait a bit. To check if it worked, you can run +``` +telnet my.gitea.example.com 2222 +``` +Once you have added a public SSH key, you can check that you can connect to your gitea server with +``` +ssh -T -p 2222 git@my.gitea.example.com +``` + +Note that gitea should be configured to listen to port 2222, i.e. `GITEA_SSH_PORT=2222` in the gitea config. -- 2.47.2 From 1a850824ce8dbe80e0a531fee4edd8e480d6ac91 Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Fri, 31 Dec 2021 16:31:34 +0100 Subject: [PATCH 223/304] fix: point to new drone instance [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f1b5da..03e24ca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitea -[![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) +[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://build.coopcloud.tech/coop-cloud/gitea) * **Category**: Development -- 2.47.2 From c8ea311d7d85a93d62f23788c413df49e3add02a Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Fri, 31 Dec 2021 16:31:34 +0100 Subject: [PATCH 224/304] fix: point to new drone instance [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f1b5da..03e24ca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Gitea -[![Build Status](https://drone.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://drone.coopcloud.tech/coop-cloud/gitea) +[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/gitea/status.svg)](https://build.coopcloud.tech/coop-cloud/gitea) * **Category**: Development -- 2.47.2 From f317364f0b0eac84296df9569fba59ad5806945c Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Tue, 18 Jan 2022 10:26:40 +0100 Subject: [PATCH 225/304] chore: publish 1.1.3+1.15.10-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index fd7e02e..3be288e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.6-rootless" + image: "gitea/gitea:1.15.10-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.2+1.15.6-rootless + - coop-cloud.${STACK_NAME}.version=1.1.3+1.15.10-rootless db: image: "mariadb:10.6" -- 2.47.2 From 8ead189fde553061634a2eaf29daab7ab556e2c2 Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Tue, 18 Jan 2022 10:26:40 +0100 Subject: [PATCH 226/304] chore: publish 1.1.3+1.15.10-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index fd7e02e..3be288e 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.6-rootless" + image: "gitea/gitea:1.15.10-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.2+1.15.6-rootless + - coop-cloud.${STACK_NAME}.version=1.1.3+1.15.10-rootless db: image: "mariadb:10.6" -- 2.47.2 From e3c2915924294b757b31dbab0697fdefebc57a8a Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 9 Mar 2022 12:01:02 +0100 Subject: [PATCH 227/304] chore: publish 1.2.0+1.16.3-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3be288e..4f402cb 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.10-rootless" + image: "gitea/gitea:1.16.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.3+1.15.10-rootless + - coop-cloud.${STACK_NAME}.version=1.2.0+1.16.3-rootless db: image: "mariadb:10.6" -- 2.47.2 From 3a47a4164e3177d93e9bc883a3d5182c6c684a59 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 9 Mar 2022 12:01:02 +0100 Subject: [PATCH 228/304] chore: publish 1.2.0+1.16.3-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 3be288e..4f402cb 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.15.10-rootless" + image: "gitea/gitea:1.16.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -51,7 +51,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.1.3+1.15.10-rootless + - coop-cloud.${STACK_NAME}.version=1.2.0+1.16.3-rootless db: image: "mariadb:10.6" -- 2.47.2 From 4ee330646ba021c1dcda2e1aa5a761360af25028 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sun, 27 Mar 2022 21:08:50 +0200 Subject: [PATCH 229/304] use domain env var --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index b188455..95239b4 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,6 @@ TYPE=gitea -DOMAIN=gitea.example.com +DOMAIN={{ .Domain }} LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.example.com -- 2.47.2 From 0cad878de5700216e1934cc48f74af6b00c2a3dd Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sun, 27 Mar 2022 21:08:50 +0200 Subject: [PATCH 230/304] use domain env var --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index b188455..95239b4 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,6 @@ TYPE=gitea -DOMAIN=gitea.example.com +DOMAIN={{ .Domain }} LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.example.com -- 2.47.2 From 78a5e2f6cdb0cfc5038564306b5ebd7e3f6d2a57 Mon Sep 17 00:00:00 2001 From: appletalk Date: Thu, 28 Apr 2022 17:50:51 -0700 Subject: [PATCH 231/304] Add disable_gravatar and federated_avatar --- .env.sample | 2 ++ app.ini.tmpl | 4 ++++ compose.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.env.sample b/.env.sample index 95239b4..957f4cb 100644 --- a/.env.sample +++ b/.env.sample @@ -11,6 +11,8 @@ GITEA_DISABLE_REGISTRATION=false GITEA_ENABLE_NOTIFY_MAIL=true GITEA_ENABLE_OPENID_SIGNIN=true GITEA_ENABLE_OPENID_SIGNUP=true +GITEA_DISABLE_GRAVATAR=false +GITEA_ENABLE_FEDERATED_AVATAR=true GITEA_MAILER_FROM=noreply@example.com GITEA_MAILER_USER=noreply@example.com diff --git a/app.ini.tmpl b/app.ini.tmpl index c3a80c9..64f01ef 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -7,6 +7,10 @@ NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} +[picture] +DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }} +ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }} + [service] ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }} AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} diff --git a/compose.yml b/compose.yml index 4f402cb..9e29f00 100644 --- a/compose.yml +++ b/compose.yml @@ -30,6 +30,8 @@ services: - GITEA_ENABLE_OPENID_SIGNUP - GITEA_SMTP_MAILER_ENABLED - GITEA_SSH_PORT + - GITEA_DISABLE_GRAVATAR + - GITEA_ENABLE_FEDERATED_AVATAR volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From cd3ded3c4e264ac04e4b9bb876c19d682f6ecf9c Mon Sep 17 00:00:00 2001 From: appletalk Date: Thu, 28 Apr 2022 17:50:51 -0700 Subject: [PATCH 232/304] Add disable_gravatar and federated_avatar --- .env.sample | 2 ++ app.ini.tmpl | 4 ++++ compose.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.env.sample b/.env.sample index 95239b4..957f4cb 100644 --- a/.env.sample +++ b/.env.sample @@ -11,6 +11,8 @@ GITEA_DISABLE_REGISTRATION=false GITEA_ENABLE_NOTIFY_MAIL=true GITEA_ENABLE_OPENID_SIGNIN=true GITEA_ENABLE_OPENID_SIGNUP=true +GITEA_DISABLE_GRAVATAR=false +GITEA_ENABLE_FEDERATED_AVATAR=true GITEA_MAILER_FROM=noreply@example.com GITEA_MAILER_USER=noreply@example.com diff --git a/app.ini.tmpl b/app.ini.tmpl index c3a80c9..64f01ef 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -7,6 +7,10 @@ NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} +[picture] +DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }} +ENABLE_FEDERATED_AVATAR = {{ env "GITEA_ENABLE_FEDERATED_AVATAR" }} + [service] ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION" }} AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} diff --git a/compose.yml b/compose.yml index 4f402cb..9e29f00 100644 --- a/compose.yml +++ b/compose.yml @@ -30,6 +30,8 @@ services: - GITEA_ENABLE_OPENID_SIGNUP - GITEA_SMTP_MAILER_ENABLED - GITEA_SSH_PORT + - GITEA_DISABLE_GRAVATAR + - GITEA_ENABLE_FEDERATED_AVATAR volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 93a9a71790d51932fde06e6f3fa287dc7c8e95e4 Mon Sep 17 00:00:00 2001 From: appletalk Date: Sun, 1 May 2022 02:39:58 +0000 Subject: [PATCH 233/304] Bump app.ini version in abra.sh --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 8b96d81..29b9c29 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v7 +export APP_INI_VERSION=v8 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { -- 2.47.2 From aa84c25a83aabb4e964eabdcebc05030e587cc02 Mon Sep 17 00:00:00 2001 From: appletalk Date: Sun, 1 May 2022 02:39:58 +0000 Subject: [PATCH 234/304] Bump app.ini version in abra.sh --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 8b96d81..29b9c29 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v7 +export APP_INI_VERSION=v8 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { -- 2.47.2 From 7560680a488ee9d412e9f8eff66b763003d38991 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 1 Jun 2022 09:46:21 +0200 Subject: [PATCH 235/304] chore: publish 1.2.1+1.16.8-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 9e29f00..cad00b1 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.16.3-rootless" + image: "gitea/gitea:1.16.8-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -53,7 +53,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.2.0+1.16.3-rootless + - coop-cloud.${STACK_NAME}.version=1.2.1+1.16.8-rootless db: image: "mariadb:10.6" -- 2.47.2 From cd39f5fc823b353de45162976c7198285152bf30 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 1 Jun 2022 09:46:21 +0200 Subject: [PATCH 236/304] chore: publish 1.2.1+1.16.8-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 9e29f00..cad00b1 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.16.3-rootless" + image: "gitea/gitea:1.16.8-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -53,7 +53,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.2.0+1.16.3-rootless + - coop-cloud.${STACK_NAME}.version=1.2.1+1.16.8-rootless db: image: "mariadb:10.6" -- 2.47.2 From b757b806e46308b90c3b1381b8fe19e02131de95 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Sep 2022 14:45:39 +0200 Subject: [PATCH 237/304] chore: publish 1.3.0+1.17.2-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index cad00b1..16db624 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.16.8-rootless" + image: "gitea/gitea:1.17.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -53,7 +53,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.2.1+1.16.8-rootless + - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless db: image: "mariadb:10.6" -- 2.47.2 From af97db80824177bb913107eff4d565a1e969f7d8 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 7 Sep 2022 14:45:39 +0200 Subject: [PATCH 238/304] chore: publish 1.3.0+1.17.2-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index cad00b1..16db624 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.16.8-rootless" + image: "gitea/gitea:1.17.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -53,7 +53,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.2.1+1.16.8-rootless + - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless db: image: "mariadb:10.6" -- 2.47.2 From 9c591965d28b2c3508ec606724bc82127fc811cb Mon Sep 17 00:00:00 2001 From: Joe Roberts Date: Mon, 19 Sep 2022 16:53:48 +0100 Subject: [PATCH 239/304] Add oauth2_client options to app.ini.tmpl --- app.ini.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 64f01ef..554c447 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -57,6 +57,16 @@ MAILER_TYPE = smtp IS_TLS_ENABLED = true {{ end }} +{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }} +[oauth2_client] +REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }} +ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }} +USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }} +UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }} +ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }} +{{ end }} + + [markup.restructuredtext] ENABLED = true FILE_EXTENSIONS = .rst -- 2.47.2 From b92ad0d45c162af4598b7d8b0a75b2d78d5f1072 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:04:33 +0000 Subject: [PATCH 240/304] Add oauth2_client options --- app.ini.tmpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index 64f01ef..ec30369 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -57,6 +57,15 @@ MAILER_TYPE = smtp IS_TLS_ENABLED = true {{ end }} +{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }} +[oauth2_client] +REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }} +ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }} +USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }} +UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }} +ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }} +{{ end }} + [markup.restructuredtext] ENABLED = true FILE_EXTENSIONS = .rst -- 2.47.2 From daf24d521f0f28df80a6910711d7277a33ad8dfa Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:09:27 +0000 Subject: [PATCH 241/304] Adding variables to .env.sample --- .env.sample | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.env.sample b/.env.sample index 957f4cb..e5e254e 100644 --- a/.env.sample +++ b/.env.sample @@ -31,3 +31,10 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # GITEA_SMTP_MAILER_ENABLED=1 # GITEA_MAILER_HOST=mail.gandi.net:465 # SECRET_SMTP_PASSWORD_VERSION=v1 + +# OATH2 Options +# GITEA_REGISTER_EMAIL_CONFIRM=replace-me +# GITEA_REGISTER_EMAIL_CONFIRM=replace-me +# GITEA_OAUTH2_USERNAME=replace-me +# GITEA_UPDATE_AVATAR=replace-me +# GITEA_ACCOUNT_LINKING=replace-me -- 2.47.2 From a4cddb7b09b1fc039cc70a2dba5e263447bae194 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:10:38 +0000 Subject: [PATCH 242/304] Adding vars to compose.yml --- compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compose.yml b/compose.yml index 16db624..e041657 100644 --- a/compose.yml +++ b/compose.yml @@ -32,6 +32,11 @@ services: - GITEA_SSH_PORT - GITEA_DISABLE_GRAVATAR - GITEA_ENABLE_FEDERATED_AVATAR + - GITEA_REGISTER_EMAIL_CONFIRM + - GITEA_ENABLE_AUTO_REGISTRATION + - GITEA_OAUTH2_USERNAME + - GITEA_UPDATE_AVATAR + - GITEA_ACCOUNT_LINKING volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 13c8af23560142c36a11cbe63754513d5fb47a7a Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:11:33 +0000 Subject: [PATCH 243/304] Version bump --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 29b9c29..2583802 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v8 +export APP_INI_VERSION=v9 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { -- 2.47.2 From fbb36d55983fd5bccf0486449752853e284eaec1 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:15:34 +0000 Subject: [PATCH 244/304] Up versions of gitea and mariadb --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index e041657..b4efdd6 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.17.2-rootless" + image: "gitea/gitea:1.17.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless db: - image: "mariadb:10.6" + image: "mariadb:10.9" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: -- 2.47.2 From f85eaed26e5118722eb16d0b0ef10362dfa37573 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 16:47:52 +0000 Subject: [PATCH 245/304] Adding GITEA_OAUTH2_CLIENT_ENABLED to compose.yml and .env.sample --- .env.sample | 1 + compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.env.sample b/.env.sample index e5e254e..9accacd 100644 --- a/.env.sample +++ b/.env.sample @@ -38,3 +38,4 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # GITEA_OAUTH2_USERNAME=replace-me # GITEA_UPDATE_AVATAR=replace-me # GITEA_ACCOUNT_LINKING=replace-me +# GITEA_OAUTH2_CLIENT_ENABLED=replace-me diff --git a/compose.yml b/compose.yml index b4efdd6..15d8dd4 100644 --- a/compose.yml +++ b/compose.yml @@ -37,6 +37,7 @@ services: - GITEA_OAUTH2_USERNAME - GITEA_UPDATE_AVATAR - GITEA_ACCOUNT_LINKING + - GITEA_OAUTH2_CLIENT_ENABLED volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 1d4dc8e8bb28f366a47605c68d8ea3fb6e353bd3 Mon Sep 17 00:00:00 2001 From: javielico Date: Sun, 13 Nov 2022 00:45:23 +0000 Subject: [PATCH 246/304] Bump version up on compose.yml --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 15d8dd4..a94b4e2 100644 --- a/compose.yml +++ b/compose.yml @@ -59,7 +59,7 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" - - coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless + - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless db: image: "mariadb:10.9" -- 2.47.2 From a1dde38834a209ce3759c11c5cf287a6d256c8dd Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 24 Nov 2022 10:53:27 -0800 Subject: [PATCH 247/304] Switch to .example.com --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 9accacd..25777cd 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,6 @@ TYPE=gitea -DOMAIN={{ .Domain }} +DOMAIN=gitea.example.com LETS_ENCRYPT_ENV=production GITEA_DOMAIN=git.example.com -- 2.47.2 From f7ee9b63c43b2ba91aaf39d8219e378f56ac04c8 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sun, 8 Jan 2023 19:12:53 -0800 Subject: [PATCH 248/304] Add optional CORS headers --- compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose.yml b/compose.yml index a94b4e2..da02861 100644 --- a/compose.yml +++ b/compose.yml @@ -38,6 +38,7 @@ services: - GITEA_UPDATE_AVATAR - GITEA_ACCOUNT_LINKING - GITEA_OAUTH2_CLIENT_ENABLED + - GITEA_CORS_ALLOW_DOMAIN volumes: - data:/var/lib/gitea - config:/etc/gitea @@ -59,6 +60,11 @@ services: - "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh" - "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}" + - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}_cors" + - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT" + - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" + - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" + - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless db: -- 2.47.2 From 910dac0c1bd620fd3961c1304621f1a207ea4e79 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 9 May 2022 16:05:30 +0200 Subject: [PATCH 249/304] add: postgresdb alternative --- .env.sample | 5 ++++- compose.mariadb.yml | 37 +++++++++++++++++++++++++++++++++++++ compose.postgres.yml | 30 ++++++++++++++++++++++++++++++ compose.yml | 27 --------------------------- 4 files changed, 71 insertions(+), 28 deletions(-) create mode 100644 compose.mariadb.yml create mode 100644 compose.postgres.yml diff --git a/.env.sample b/.env.sample index 25777cd..f1e0d28 100644 --- a/.env.sample +++ b/.env.sample @@ -2,6 +2,9 @@ TYPE=gitea DOMAIN=gitea.example.com LETS_ENCRYPT_ENV=production +COMPOSE_FILE="compose.yml" +COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" GITEA_DOMAIN=git.example.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true @@ -27,7 +30,7 @@ SECRET_JWT_SECRET_VERSION=v1 # length=43 SECRET_SECRET_KEY_VERSION=v1 # length=64 # SMTP Mailer -# COMPOSE_FILE="compose.yml:compose.smtp.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" # GITEA_SMTP_MAILER_ENABLED=1 # GITEA_MAILER_HOST=mail.gandi.net:465 # SECRET_SMTP_PASSWORD_VERSION=v1 diff --git a/compose.mariadb.yml b/compose.mariadb.yml new file mode 100644 index 0000000..8be57ec --- /dev/null +++ b/compose.mariadb.yml @@ -0,0 +1,37 @@ +version: '3.8' + +services: + app: + environment: + - GITEA_DB_TYPE=mysql + - GITEA_DB_HOST="db:3306" + - GITEA_DB_NAME=gitea + - GITEA_DB_USER=gitea + db: + image: "mariadb:10.9" + command: | + mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci + environment: + - MYSQL_DATABASE=gitea + - MYSQL_USER=gitea + - MYSQL_PASSWORD_FILE=/run/secrets/db_password + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password + secrets: + - db_password + - db_root_password + volumes: + - "mariadb:/var/lib/mysql" + networks: + - internal + +secrets: + db_password: + name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} + external: true + db_root_password: + name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} + external: true + +volumes: + mariadb: + internal: diff --git a/compose.postgres.yml b/compose.postgres.yml new file mode 100644 index 0000000..24c681a --- /dev/null +++ b/compose.postgres.yml @@ -0,0 +1,30 @@ +version: '3.8' + +services: + app: + environment: + - GITEA_DB_TYPE=postgres + - GITEA_DB_HOST="db:5432" + - GITEA_DB_NAME=gitea + - GITEA_DB_USER=gitea + db: + image: postgres:9.6 + environment: + - POSTGRES_DB=gitea + - POSTGRES_USER=gitea + - POSTGRES_PASSWORD_FILE=/run/secrets/db_password + secrets: + - db_password + volumes: + - db:/var/lib/postgresql/data + networks: + - internal + +secrets: + db_password: + name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} + external: true + +volumes: + db: + internal: diff --git a/compose.yml b/compose.yml index da02861..f7bd22a 100644 --- a/compose.yml +++ b/compose.yml @@ -19,10 +19,6 @@ services: - GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION - GITEA_APP_NAME - GITEA_AUTO_WATCH_NEW_REPOS - - GITEA_DB_HOST="db:3306" - - GITEA_DB_NAME=gitea - - GITEA_DB_TYPE=mysql - - GITEA_DB_USER=gitea - GITEA_DISABLE_REGISTRATION - GITEA_DOMAIN=${DOMAIN} - GITEA_ENABLE_NOTIFY_MAIL @@ -67,22 +63,6 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless - db: - image: "mariadb:10.9" - command: | - mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci - environment: - - MYSQL_DATABASE=gitea - - MYSQL_USER=gitea - - MYSQL_PASSWORD_FILE=/run/secrets/db_password - - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password - secrets: - - db_password - - db_root_password - volumes: - - "mariadb:/var/lib/mysql" - networks: - - internal networks: internal: @@ -100,12 +80,6 @@ configs: template_driver: golang secrets: - db_password: - name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION} - external: true - db_root_password: - name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION} - external: true internal_token: name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION} external: true @@ -119,4 +93,3 @@ secrets: volumes: data: config: - mariadb: -- 2.47.2 From 1ea412525f7afae99804cc1157d6148b499a1a10 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 9 Jan 2023 17:02:07 +0100 Subject: [PATCH 250/304] chore: publish 2.0.0+1.18.0-rootless release --- compose.yml | 4 ++-- release/2.0.0+1.18.0-rootless | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 release/2.0.0+1.18.0-rootless diff --git a/compose.yml b/compose.yml index f7bd22a..eff3da0 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.17.3-rootless" + image: "gitea/gitea:1.18.0-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless + - coop-cloud.${STACK_NAME}.version=2.0.0+1.18.0-rootless networks: diff --git a/release/2.0.0+1.18.0-rootless b/release/2.0.0+1.18.0-rootless new file mode 100644 index 0000000..f02d11b --- /dev/null +++ b/release/2.0.0+1.18.0-rootless @@ -0,0 +1,8 @@ +This release adds the possibility to run gitea with postgres. +Please add the following lines to your servers .env file! + +``` +COMPOSE_FILE="compose.yml" +COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" +``` -- 2.47.2 From 89400089ec2c837a4abc4c23726058a4e2f754fb Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 17 Jan 2023 10:45:19 +0100 Subject: [PATCH 251/304] fix: drop db_password from main compose def Now available in mariadb/postgresql compose files. --- compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/compose.yml b/compose.yml index eff3da0..ecb0384 100644 --- a/compose.yml +++ b/compose.yml @@ -11,7 +11,6 @@ services: target: /usr/local/bin/docker-setup.sh mode: 0555 secrets: - - db_password - internal_token - jwt_secret - secret_key -- 2.47.2 From e2cd36873c384737c440dbeda80f9994d2683ecc Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 19 Jan 2023 16:02:27 -0800 Subject: [PATCH 252/304] Update abra syntax in examples (finally) [mass update] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 03e24ca..1fb8d6f 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ 2. Deploy [`coop-cloud/traefik`][cc-traefik] 3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like to save secrets in `pass`) -4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to +4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box -5. `abra app YOURAPPDOMAIN deploy` +5. `abra app deploy YOURAPPDOMAIN` ## Create first user -- 2.47.2 From 936fb940cbdc0c00ce98bb5cd9c63e11c4cbe9a1 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Fri, 20 Jan 2023 10:48:44 +0100 Subject: [PATCH 253/304] Revert "fix: drop db_password from main compose def" This reverts commit 89400089ec2c837a4abc4c23726058a4e2f754fb. db_password secret is still needed in app service to set the db secret in app.ini.tmpl --- compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yml b/compose.yml index ecb0384..eff3da0 100644 --- a/compose.yml +++ b/compose.yml @@ -11,6 +11,7 @@ services: target: /usr/local/bin/docker-setup.sh mode: 0555 secrets: + - db_password - internal_token - jwt_secret - secret_key -- 2.47.2 From 7d7761dec6e0bde472caf8809cdce2a7e7aea8aa Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Mon, 9 Jan 2023 16:38:06 +0100 Subject: [PATCH 254/304] feat: add forgejo overwrite --- .env.sample | 3 +++ compose.forgejo.yml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 compose.forgejo.yml diff --git a/.env.sample b/.env.sample index f1e0d28..e562e4c 100644 --- a/.env.sample +++ b/.env.sample @@ -6,6 +6,9 @@ COMPOSE_FILE="compose.yml" COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" +# Enable to use forgejo instead of gitea +# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml" + GITEA_DOMAIN=git.example.com GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true GITEA_APP_NAME="Git with solidaritea" diff --git a/compose.forgejo.yml b/compose.forgejo.yml new file mode 100644 index 0000000..29a5e00 --- /dev/null +++ b/compose.forgejo.yml @@ -0,0 +1,5 @@ +version: '3.8' + +services: + app: + image: codeberg.org/forgejo/forgejo:1.18.0-1-rootless -- 2.47.2 From 9413c79e8f9805da57414cfc7aaf2d33cc274804 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Fri, 20 Jan 2023 11:00:24 +0100 Subject: [PATCH 255/304] chore: publish 2.0.1+1.18.2-rootless release --- compose.forgejo.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.forgejo.yml b/compose.forgejo.yml index 29a5e00..8aee549 100644 --- a/compose.forgejo.yml +++ b/compose.forgejo.yml @@ -2,4 +2,4 @@ version: '3.8' services: app: - image: codeberg.org/forgejo/forgejo:1.18.0-1-rootless + image: codeberg.org/forgejo/forgejo:1.18.2-0-rootless diff --git a/compose.yml b/compose.yml index eff3da0..10456e0 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.18.0-rootless" + image: "gitea/gitea:1.18.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.0.0+1.18.0-rootless + - coop-cloud.${STACK_NAME}.version=2.0.1+1.18.2-rootless networks: -- 2.47.2 From cd0fff667aad31e9b18a7e3bc04f20f667177393 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 10:27:11 -0800 Subject: [PATCH 256/304] Automatically generate catalogue on release [mass update] Re: coop-cloud/recipes-catalogue-json#4 --- .drone.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 868beb0..d84d926 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,11 +37,17 @@ trigger: - master --- kind: pipeline -name: recipe release +name: generate recipe catalogue steps: - name: release a new version - image: thecoopcloud/drone-abra:latest + image: plugins/downstream settings: - command: recipe gitea release - deploy_key: - from_secret: abra_bot_deploy_key + server: https://build.coopcloud.tech + token: + from_secret: drone_abra-bot_token + fork: true + repositories: + - coop-cloud/auto-recipes-catalogue-json + +trigger: + event: tag -- 2.47.2 From 63118ecbd875fb047bf4e98bd8f52924639e37d1 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 11:58:41 -0800 Subject: [PATCH 257/304] Fix CI by adding networks: [mass update] --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index d84d926..cae255a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ steps: settings: host: swarm-test.autonomic.zone stack: gitea + networks: + - proxy generate_secrets: true purge: true deploy_key: -- 2.47.2 From a04fe41c1b20514a58c66f40e33f75898f973eea Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 22:38:13 -0800 Subject: [PATCH 258/304] Specify mariadb for tests --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index cae255a..2729e42 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,7 @@ steps: deploy_key: from_secret: drone_ssh_swarm_test environment: + COMPOSE_FILE: compose.yml:compose.mariadb.yml APP_INI_VERSION: v1 DOCKER_SETUP_SH_VERSION: v1 DOMAIN: gitea.swarm-test.autonomic.zone -- 2.47.2 From 9cf26a01540992ad54c5053edb62caaffd8e70c5 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 23:31:14 -0800 Subject: [PATCH 259/304] Switch to thecoopcloud/stack-ssh-deploy --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2729e42..1dacea8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ kind: pipeline name: deploy to swarm-test.autonomic.zone steps: - name: deployment - image: decentral1se/stack-ssh-deploy:latest + image: thecoopcloud/stack-ssh-deploy:latest settings: host: swarm-test.autonomic.zone stack: gitea @@ -13,8 +13,8 @@ steps: purge: true deploy_key: from_secret: drone_ssh_swarm_test + compose: "compose.yml:compose.mariadb.yml" environment: - COMPOSE_FILE: compose.yml:compose.mariadb.yml APP_INI_VERSION: v1 DOCKER_SETUP_SH_VERSION: v1 DOMAIN: gitea.swarm-test.autonomic.zone -- 2.47.2 From 8b466acf66d7a1b1efcfedd642406a59e57c59e7 Mon Sep 17 00:00:00 2001 From: Cassowary Rusnov Date: Wed, 15 Mar 2023 13:18:39 -0700 Subject: [PATCH 260/304] chore: publish 2.1.0+1.18.5-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 10456e0..0a3e130 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.18.2-rootless" + image: "gitea/gitea:1.18.5-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.0.1+1.18.2-rootless + - coop-cloud.${STACK_NAME}.version=2.1.0+1.18.5-rootless networks: -- 2.47.2 From d56a1474fed41c2b6b368200b18d7738506cd9ed Mon Sep 17 00:00:00 2001 From: Javielico Date: Mon, 8 May 2023 20:58:58 +0100 Subject: [PATCH 261/304] Gitea up to latest stable 1.19.3 --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 0a3e130..ae4a9c7 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.18.5-rootless" + image: "gitea/gitea:1.19.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.1.0+1.18.5-rootless + - coop-cloud.${STACK_NAME}.version=2.1.2+1.19.3-rootless networks: -- 2.47.2 From 8f5587099d2c30b23c2606d9857f067919511d50 Mon Sep 17 00:00:00 2001 From: Javielico Date: Mon, 8 May 2023 21:01:16 +0100 Subject: [PATCH 262/304] Postgres up to 15.2 --- compose.postgres.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index 24c681a..da1390a 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:9.6 + image: postgres:15.2 environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea -- 2.47.2 From d5577a0f75747d6c3ede82e738333f1a00373820 Mon Sep 17 00:00:00 2001 From: Javielico Date: Mon, 8 May 2023 21:03:09 +0100 Subject: [PATCH 263/304] Mariadb to stable lts 10.11.2 --- compose.mariadb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 8be57ec..7322938 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: "mariadb:10.9" + image: "mariadb:10.11.2" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: -- 2.47.2 From 77dd223f941e5d4c5f5c37f076f2ec97d452168c Mon Sep 17 00:00:00 2001 From: Javielico Date: Tue, 9 May 2023 20:31:17 +0100 Subject: [PATCH 264/304] Added commit message warning about Pgsql upgrade --- release/2.1.2+1.19.3-rootless | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 release/2.1.2+1.19.3-rootless diff --git a/release/2.1.2+1.19.3-rootless b/release/2.1.2+1.19.3-rootless new file mode 100644 index 0000000..712a9a1 --- /dev/null +++ b/release/2.1.2+1.19.3-rootless @@ -0,0 +1,2 @@ +Beware that you'll also be updating Postgres if you're running it. Usually with major updates it might involve pg_dumpall / pg_restore either side of the upgrade because the server app doesn't know how to upgrade data storage formats, won't launch if it detects an old data format, a pg_upgrade command is available. More info on https://git.coopcloud.tech/coop-cloud/gitea/pulls/31 + -- 2.47.2 From 9fe02cb19f269957aa90d1f1fe25a4495f1834b5 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Tue, 6 Jun 2023 16:19:52 +0200 Subject: [PATCH 265/304] reduce logging verbosity --- app.ini.tmpl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app.ini.tmpl b/app.ini.tmpl index ec30369..c60a7cf 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -71,3 +71,10 @@ ENABLED = true FILE_EXTENSIONS = .rst RENDER_COMMAND = rst2html IS_INPUT_FILE = false + +[log] +MODE=console +LEVEL=WARN +STACKTRACE_LEVEL=None +ENABLE_ACCESS_LOG=false +ENABLE_XORM_LOG=false -- 2.47.2 From f9249f128498ffac3c42d3d61dd4c9fa6728f954 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Tue, 6 Jun 2023 17:31:14 +0200 Subject: [PATCH 266/304] chore: publish 2.2.0+1.19.3-rootless release --- compose.forgejo.yml | 2 +- compose.postgres.yml | 2 +- compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.forgejo.yml b/compose.forgejo.yml index 8aee549..52d8279 100644 --- a/compose.forgejo.yml +++ b/compose.forgejo.yml @@ -2,4 +2,4 @@ version: '3.8' services: app: - image: codeberg.org/forgejo/forgejo:1.18.2-0-rootless + image: codeberg.org/forgejo/forgejo:1.19.3-0-rootless diff --git a/compose.postgres.yml b/compose.postgres.yml index da1390a..f18ee1d 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.2 + image: postgres:15.3 environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea diff --git a/compose.yml b/compose.yml index ae4a9c7..fd4a4a4 100644 --- a/compose.yml +++ b/compose.yml @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.1.2+1.19.3-rootless + - coop-cloud.${STACK_NAME}.version=2.2.0+1.19.3-rootless networks: -- 2.47.2 From 46bb242fe7b40a53efa11ad8ffceafa61eb4a140 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 25 Jul 2023 12:50:30 +0100 Subject: [PATCH 267/304] chore: publish 2.3.0+1.20.1-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index fd4a4a4..de68bf0 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.19.3-rootless" + image: "gitea/gitea:1.20.1-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.2.0+1.19.3-rootless + - coop-cloud.${STACK_NAME}.version=2.3.0+1.20.1-rootless networks: -- 2.47.2 From d18379a364cc6952b1177448c921d2f087c35482 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 25 Jul 2023 12:52:59 +0100 Subject: [PATCH 268/304] Bump APP_INI_VERSION --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 2583802..d564814 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v9 +export APP_INI_VERSION=v10 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { -- 2.47.2 From b95eae3b57f971b6dd923f736523756feb8a01a4 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Tue, 25 Jul 2023 12:53:45 +0100 Subject: [PATCH 269/304] chore: publish 2.3.1+1.20.1-rootless release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index de68bf0..569237b 100644 --- a/compose.yml +++ b/compose.yml @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.3.0+1.20.1-rootless + - coop-cloud.${STACK_NAME}.version=2.3.1+1.20.1-rootless networks: -- 2.47.2 From 9153c4db2a922998b51879178a540155f54d3fb3 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 28 Aug 2023 14:08:11 +0200 Subject: [PATCH 270/304] chore: publish 2.3.2+1.20.3-rootless release --- compose.postgres.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index f18ee1d..605c0b4 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.3 + image: postgres:15.4 environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea diff --git a/compose.yml b/compose.yml index 569237b..be544d2 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.20.1-rootless" + image: "gitea/gitea:1.20.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.3.1+1.20.1-rootless + - coop-cloud.${STACK_NAME}.version=2.3.2+1.20.3-rootless networks: -- 2.47.2 From 73970dd79c04fcd10d43ac5b8307efe398c3f1f6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 30 Oct 2023 12:43:03 +0000 Subject: [PATCH 271/304] chore: publish 2.3.3+1.20.5-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index be544d2..84f2142 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.20.3-rootless" + image: "gitea/gitea:1.20.5-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.3.2+1.20.3-rootless + - coop-cloud.${STACK_NAME}.version=2.3.3+1.20.5-rootless networks: -- 2.47.2 From b0ce4736276874485beb1d39d77ef1f7a5610d38 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Mon, 20 Nov 2023 12:43:42 +0000 Subject: [PATCH 272/304] chore: publish 2.4.0+1.21.0-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 84f2142..8137b0d 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.20.5-rootless" + image: "gitea/gitea:1.21.0-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.3.3+1.20.5-rootless + - coop-cloud.${STACK_NAME}.version=2.4.0+1.21.0-rootless networks: -- 2.47.2 From c8ea2ddf0cb42e0cf6678ce04c88783017c8c558 Mon Sep 17 00:00:00 2001 From: knoflook Date: Mon, 27 Nov 2023 13:10:23 +0100 Subject: [PATCH 273/304] chore: publish 2.5.0+1.21.1-rootless release --- compose.postgres.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index 605c0b4..365e3c8 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.4 + image: postgres:15.5 environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea diff --git a/compose.yml b/compose.yml index 8137b0d..ffef8e2 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.0-rootless" + image: "gitea/gitea:1.21.1-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -61,7 +61,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.4.0+1.21.0-rootless + - coop-cloud.${STACK_NAME}.version=2.5.0+1.21.1-rootless networks: -- 2.47.2 From 464c890afbefd309e7c2d5ef4ba849f071896627 Mon Sep 17 00:00:00 2001 From: Cassowary Rusnov Date: Sun, 24 Sep 2023 11:57:53 -0700 Subject: [PATCH 274/304] Add LANDING_PAGE support for configuration --- .env.sample | 1 + abra.sh | 2 +- app.ini.tmpl | 2 +- compose.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index e562e4c..f9e0614 100644 --- a/.env.sample +++ b/.env.sample @@ -19,6 +19,7 @@ GITEA_ENABLE_OPENID_SIGNIN=true GITEA_ENABLE_OPENID_SIGNUP=true GITEA_DISABLE_GRAVATAR=false GITEA_ENABLE_FEDERATED_AVATAR=true +GITEA_LANDING_PAGE=organizations GITEA_MAILER_FROM=noreply@example.com GITEA_MAILER_USER=noreply@example.com diff --git a/abra.sh b/abra.sh index d564814..2db631c 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v10 +export APP_INI_VERSION=v11 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { diff --git a/app.ini.tmpl b/app.ini.tmpl index c60a7cf..5d5b374 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -29,7 +29,7 @@ STARTUP_TIMEOUT = 0 [server] DOMAIN = {{ env "GITEA_DOMAIN" }} -LANDING_PAGE = organizations +LANDING_PAGE = {{ env "GITEA_LANDING_PAGE" }} ROOT_URL = https://%(DOMAIN)s/ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }} SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }} diff --git a/compose.yml b/compose.yml index ffef8e2..114211e 100644 --- a/compose.yml +++ b/compose.yml @@ -35,6 +35,7 @@ services: - GITEA_ACCOUNT_LINKING - GITEA_OAUTH2_CLIENT_ENABLED - GITEA_CORS_ALLOW_DOMAIN + - GITEA_LANDING_PAGE volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 9d44d9e61c1bb3aafe9c796df565c1eaa1533603 Mon Sep 17 00:00:00 2001 From: Cassowary Date: Thu, 7 Dec 2023 18:01:05 -0800 Subject: [PATCH 275/304] add [repository.upload] support to the configuration Note: Requires updates to config file so add this to the release notes. --- .env.sample | 5 +++++ abra.sh | 2 +- app.ini.tmpl | 7 +++++++ compose.yml | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index f9e0614..3afd354 100644 --- a/.env.sample +++ b/.env.sample @@ -21,6 +21,11 @@ GITEA_DISABLE_GRAVATAR=false GITEA_ENABLE_FEDERATED_AVATAR=true GITEA_LANDING_PAGE=organizations +GITEA_REPO_UPLOAD_ENABLED=true +GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* +GITEA_REPO_UPLOAD_MAX_SIZE=50 +GITEA_REPO_UPLOAD_MAX_FILES=5 + GITEA_MAILER_FROM=noreply@example.com GITEA_MAILER_USER=noreply@example.com diff --git a/abra.sh b/abra.sh index 2db631c..c8b54ab 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v11 +export APP_INI_VERSION=v15 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { diff --git a/app.ini.tmpl b/app.ini.tmpl index 5d5b374..39c8b77 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -24,6 +24,13 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }} [repository] DEFAULT_BRANCH = main +[repository.upload] +ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }} +ALLOWED_TYPES = {{ env "GITEA_REPO_UPLOAD_ALLOWED_TYPES" }} +FILE_MAX_SIZE = {{ env "GITEA_REPO_UPLOAD_MAX_SIZE" }} +MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }} + + [indexer] STARTUP_TIMEOUT = 0 diff --git a/compose.yml b/compose.yml index 114211e..2b1e836 100644 --- a/compose.yml +++ b/compose.yml @@ -36,6 +36,11 @@ services: - GITEA_OAUTH2_CLIENT_ENABLED - GITEA_CORS_ALLOW_DOMAIN - GITEA_LANDING_PAGE + - GITEA_REPO_UPLOAD_ENABLED + - GITEA_REPO_UPLOAD_ALLOWED_TYPES + - GITEA_REPO_UPLOAD_MAX_SIZE + - GITEA_REPO_UPLOAD_MAX_FILES + volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From ca9d0b4a6cab0820082fd27f15f3eb42d2b31940 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 17 Jan 2024 17:56:28 -0300 Subject: [PATCH 276/304] chore: publish 2.5.1+1.21.4-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 2b1e836..be79f2f 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.1-rootless" + image: "gitea/gitea:1.21.4-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -67,7 +67,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.5.0+1.21.1-rootless + - coop-cloud.${STACK_NAME}.version=2.5.1+1.21.4-rootless networks: -- 2.47.2 From a0e8ba4839f9e4ffec9c520410b05c3eb9d620d6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 8 Feb 2024 14:36:08 -0300 Subject: [PATCH 277/304] chore: publish 2.5.2+1.21.5-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index be79f2f..4a29248 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.4-rootless" + image: "gitea/gitea:1.21.5-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -67,7 +67,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.5.1+1.21.4-rootless + - coop-cloud.${STACK_NAME}.version=2.5.2+1.21.5-rootless networks: -- 2.47.2 From 4421f81a35c7b168b8be897d0c3d90c82ff8da4c Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 30 Mar 2024 16:05:32 -0300 Subject: [PATCH 278/304] Add healthcheck, update metadata --- README.md | 4 ++-- compose.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fb8d6f..4a16090 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ * **Category**: Development -* **Status**: 3, stable +* **Status**: 5 * **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream * **Healthcheck**: Yes * **Backups**: Yes -* **Email**: ? +* **Email**: Yes * **Tests**: 2 * **SSO**: 3 (OAuth) diff --git a/compose.yml b/compose.yml index 4a29248..995b48b 100644 --- a/compose.yml +++ b/compose.yml @@ -49,6 +49,12 @@ services: networks: - proxy - internal + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"] + interval: 30s + timeout: 10s + retries: 10 + start_period: 1m deploy: update_config: failure_action: rollback -- 2.47.2 From 3815417c2c392607fcf7c72fedf6494c11cac2e4 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 30 Mar 2024 16:07:28 -0300 Subject: [PATCH 279/304] chore: publish 2.6.0+1.21.5-rootless release --- compose.yml | 2 +- release/2.6.0+1.21.5-rootless | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release/2.6.0+1.21.5-rootless diff --git a/compose.yml b/compose.yml index 995b48b..998d8df 100644 --- a/compose.yml +++ b/compose.yml @@ -73,7 +73,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.5.2+1.21.5-rootless + - coop-cloud.${STACK_NAME}.version=2.6.0+1.21.5-rootless networks: diff --git a/release/2.6.0+1.21.5-rootless b/release/2.6.0+1.21.5-rootless new file mode 100644 index 0000000..f0c0f4c --- /dev/null +++ b/release/2.6.0+1.21.5-rootless @@ -0,0 +1 @@ +This release adds a docker healthcheck for the main Gitea service -- please pay careful attention when updating apps, and as always feel free to ask in Matrix if you run into any bugs 🐛 \ No newline at end of file -- 2.47.2 From ea7e26698aa5d57afc788e9a2254f2f1732f5e58 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 28 Mar 2024 17:08:44 +0100 Subject: [PATCH 280/304] feat: enable indexer for search [ci skip] See https://git.coopcloud.tech/coop-cloud/organising/issues/589 --- .env.sample | 4 ++++ abra.sh | 2 +- app.ini.tmpl | 3 ++- compose.yml | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.env.sample b/.env.sample index 3afd354..ca158f1 100644 --- a/.env.sample +++ b/.env.sample @@ -51,3 +51,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # GITEA_UPDATE_AVATAR=replace-me # GITEA_ACCOUNT_LINKING=replace-me # GITEA_OAUTH2_CLIENT_ENABLED=replace-me + +# Indexer (for issue search) +# GITEA_REPO_INDEXER_ENABLED=false +# GITEA_STARTUP_TIMEOUT=-1 diff --git a/abra.sh b/abra.sh index c8b54ab..40fbb95 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v15 +export APP_INI_VERSION=v16 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { diff --git a/app.ini.tmpl b/app.ini.tmpl index 39c8b77..60a0059 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -32,7 +32,8 @@ MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }} [indexer] -STARTUP_TIMEOUT = 0 +REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }} +STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "-1" }} [server] DOMAIN = {{ env "GITEA_DOMAIN" }} diff --git a/compose.yml b/compose.yml index 4a29248..8150ada 100644 --- a/compose.yml +++ b/compose.yml @@ -40,7 +40,8 @@ services: - GITEA_REPO_UPLOAD_ALLOWED_TYPES - GITEA_REPO_UPLOAD_MAX_SIZE - GITEA_REPO_UPLOAD_MAX_FILES - + - GITEA_REPO_INDEXER_ENABLED + - GITEA_STARTUP_TIMEOUT volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 43abfe04837c3ea018467e9bae244b234686b921 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 1 Apr 2024 16:38:05 +0200 Subject: [PATCH 281/304] chore: publish 2.6.1+1.21.10-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 32fee8c..3401e07 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.5-rootless" + image: "gitea/gitea:1.21.10-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -74,7 +74,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.6.0+1.21.5-rootless + - coop-cloud.${STACK_NAME}.version=2.6.1+1.21.10-rootless networks: -- 2.47.2 From ced3ea7978536016d878b997dc67e66567e0ae97 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 1 Apr 2024 17:05:17 +0200 Subject: [PATCH 282/304] chore: publish 2.6.2+1.21.10-rootless release --- .env.sample | 1 + abra.sh | 2 +- app.ini.tmpl | 1 + compose.yml | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index ca158f1..eb50fd6 100644 --- a/.env.sample +++ b/.env.sample @@ -54,4 +54,5 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # Indexer (for issue search) # GITEA_REPO_INDEXER_ENABLED=false +# GITEA_ISSUE_INDEXER_TYPE=db # GITEA_STARTUP_TIMEOUT=-1 diff --git a/abra.sh b/abra.sh index 40fbb95..873841a 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v16 +export APP_INI_VERSION=v17 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { diff --git a/app.ini.tmpl b/app.ini.tmpl index 60a0059..0b5c358 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -33,6 +33,7 @@ MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }} [indexer] REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }} +ISSUE_INDEXER_TYPE= {{ or (env "GITEA_ISSUE_INDEXER_TYPE") "db" }} STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "-1" }} [server] diff --git a/compose.yml b/compose.yml index 3401e07..395fd5b 100644 --- a/compose.yml +++ b/compose.yml @@ -41,6 +41,7 @@ services: - GITEA_REPO_UPLOAD_MAX_SIZE - GITEA_REPO_UPLOAD_MAX_FILES - GITEA_REPO_INDEXER_ENABLED + - GITEA_ISSUE_INDEXER_TYPE - GITEA_STARTUP_TIMEOUT volumes: - data:/var/lib/gitea @@ -74,7 +75,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.6.1+1.21.10-rootless + - coop-cloud.${STACK_NAME}.version=2.6.2+1.21.10-rootless networks: -- 2.47.2 From e0d73083e2a449cf9acf1a08bb246917de9488d1 Mon Sep 17 00:00:00 2001 From: Javielico Date: Sun, 14 Apr 2024 20:48:18 +0100 Subject: [PATCH 283/304] Adding variable configs --- .env.sample | 10 ++++++++++ compose.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.env.sample b/.env.sample index eb50fd6..ccee28a 100644 --- a/.env.sample +++ b/.env.sample @@ -20,6 +20,16 @@ GITEA_ENABLE_OPENID_SIGNUP=true GITEA_DISABLE_GRAVATAR=false GITEA_ENABLE_FEDERATED_AVATAR=true GITEA_LANDING_PAGE=organizations +GITEA_SHOW_USER_EMAIL=false +GITEA_DISABLE_REGULAR_ORG_CREATION=true +GITEA_DEFAULT_KEEP_EMAIL_PRIVATE=true +GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION=false +GITEA_ENABLE_USER_HEATMAP=false +GITEA_DEFAULT_USER_VISIBILITY=limited +GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private +GITEA_DEFAULT_ORG_VISIBILITY=limited +GITEA_REQUIRE_SIGNIN_VIEW=true + GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/compose.yml b/compose.yml index 395fd5b..5f2bd1d 100644 --- a/compose.yml +++ b/compose.yml @@ -43,6 +43,16 @@ services: - GITEA_REPO_INDEXER_ENABLED - GITEA_ISSUE_INDEXER_TYPE - GITEA_STARTUP_TIMEOUT + - GITEA_SHOW_USER_EMAIL + - GITEA_DISABLE_REGULAR_ORG_CREATION + - GITEA_DEFAULT_KEEP_EMAIL_PRIVATE + - GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION + - GITEA_ENABLE_USER_HEATMAP + - GITEA_DEFAULT_USER_VISIBILITY + - GITEA_ALLOWED_USER_VISIBILITY_MODES + - GITEA_DEFAULT_ORG_VISIBILITY + - GITEA_REQUIRE_SIGNIN_VIEW + volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 94de0096fc1e577ecfd3a2906490ae59cc8e5b9e Mon Sep 17 00:00:00 2001 From: Javielico Date: Thu, 18 Apr 2024 19:01:32 +0100 Subject: [PATCH 284/304] Adding DISABLE_AUTH --- .env.sample | 2 +- compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index ccee28a..e811e5b 100644 --- a/.env.sample +++ b/.env.sample @@ -29,7 +29,7 @@ GITEA_DEFAULT_USER_VISIBILITY=limited GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private GITEA_DEFAULT_ORG_VISIBILITY=limited GITEA_REQUIRE_SIGNIN_VIEW=true - +GITEA_DISABLE_AUTH=true GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/compose.yml b/compose.yml index 5f2bd1d..bf2ab43 100644 --- a/compose.yml +++ b/compose.yml @@ -52,7 +52,7 @@ services: - GITEA_ALLOWED_USER_VISIBILITY_MODES - GITEA_DEFAULT_ORG_VISIBILITY - GITEA_REQUIRE_SIGNIN_VIEW - + - GITEA_DISABLE_AUTH volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From 2b15ff9c287e9bc5cddf1ad538e47c3850a835c8 Mon Sep 17 00:00:00 2001 From: Javielico Date: Tue, 23 Apr 2024 16:13:28 +0100 Subject: [PATCH 285/304] Added components to app.ini --- .env.sample | 1 - app.ini.tmpl | 12 ++++++++++++ compose.yml | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index e811e5b..201bd65 100644 --- a/.env.sample +++ b/.env.sample @@ -29,7 +29,6 @@ GITEA_DEFAULT_USER_VISIBILITY=limited GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private GITEA_DEFAULT_ORG_VISIBILITY=limited GITEA_REQUIRE_SIGNIN_VIEW=true -GITEA_DISABLE_AUTH=true GITEA_REPO_UPLOAD_ENABLED=true GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/* diff --git a/app.ini.tmpl b/app.ini.tmpl index 0b5c358..fd48984 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -16,6 +16,13 @@ ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATIO AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }} DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }} ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }} +DEFAULT_KEEP_EMAIL_PRIVATE = {{ env "GITEA_DEFAULT_KEEP_EMAIL_PRIVATE" }} +DEFAULT_ALLOW_CREATE_ORGANIZATION = {{ env "GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION" }} +ENABLE_USER_HEATMAP = {{ env "GITEA_ENABLE_USER_HEATMAP" }} +DEFAULT_USER_VISIBILITY = {{ env "GITEA_DEFAULT_USER_VISIBILITY" }} +ALLOWED_USER_VISIBILITY_MODES = {{ env "GITEA_ALLOWED_USER_VISIBILITY_MODES" }} +DEFAULT_ORG_VISIBILITY = {{ env "GITEA_DEFAULT_ORG_VISIBILITY" }} +REQUIRE_SIGNIN_VIEW = {{ env "GITEA_REQUIRE_SIGNIN_VIEW" }} [openid] ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }} @@ -30,6 +37,8 @@ ALLOWED_TYPES = {{ env "GITEA_REPO_UPLOAD_ALLOWED_TYPES" }} FILE_MAX_SIZE = {{ env "GITEA_REPO_UPLOAD_MAX_SIZE" }} MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }} +[ui] +SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }} [indexer] REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }} @@ -52,6 +61,9 @@ REVERSE_PROXY_LIMIT = 1 REVERSE_PROXY_TRUSTED_PROXIES = * SECRET_KEY = {{ secret "secret_key" }} +[admin] +DISABLE_REGULAR_ORG_CREATION = {{ env "GITEA_DISABLE_REGULAR_ORG_CREATION" }} + [oauth2] JWT_SECRET = {{ secret "jwt_secret" }} diff --git a/compose.yml b/compose.yml index bf2ab43..776607f 100644 --- a/compose.yml +++ b/compose.yml @@ -52,7 +52,6 @@ services: - GITEA_ALLOWED_USER_VISIBILITY_MODES - GITEA_DEFAULT_ORG_VISIBILITY - GITEA_REQUIRE_SIGNIN_VIEW - - GITEA_DISABLE_AUTH volumes: - data:/var/lib/gitea - config:/etc/gitea -- 2.47.2 From dbde635976653653862a9664b7d9ae75e29a9166 Mon Sep 17 00:00:00 2001 From: Javielico Date: Tue, 23 Apr 2024 21:45:55 +0100 Subject: [PATCH 286/304] Removing access log to false as fallback has been removed on Gitea 1.21 --- app.ini.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/app.ini.tmpl b/app.ini.tmpl index fd48984..896f5b5 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -97,5 +97,4 @@ IS_INPUT_FILE = false MODE=console LEVEL=WARN STACKTRACE_LEVEL=None -ENABLE_ACCESS_LOG=false ENABLE_XORM_LOG=false -- 2.47.2 From baacc575c29d1dd3df740198bc4928f5de28e816 Mon Sep 17 00:00:00 2001 From: Javielico Date: Wed, 24 Apr 2024 21:03:14 +0100 Subject: [PATCH 287/304] chore: publish 2.7.0+1.21.11-rootless release --- compose.postgres.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index 365e3c8..63c53bc 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.5 + image: postgres:15.6 environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea diff --git a/compose.yml b/compose.yml index 776607f..41acfb8 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.10-rootless" + image: "gitea/gitea:1.21.11-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -84,7 +84,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.6.2+1.21.10-rootless + - coop-cloud.${STACK_NAME}.version=2.7.0+1.21.11-rootless networks: -- 2.47.2 From f26296ba5c459b7ee949e3589808d8bcd8824426 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 29 Apr 2024 14:54:02 +0200 Subject: [PATCH 288/304] add backup label --- compose.mariadb.yml | 5 +++++ compose.postgres.yml | 5 +++++ compose.yml | 1 + 3 files changed, 11 insertions(+) diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 7322938..2c20754 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -9,6 +9,11 @@ services: - GITEA_DB_USER=gitea db: image: "mariadb:10.11.2" + deploy: + labels: + backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql' + backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql" + backupbot.backup.path: "/var/lib/mysql/backup.sql" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: diff --git a/compose.postgres.yml b/compose.postgres.yml index 63c53bc..37f1aa7 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -9,6 +9,11 @@ services: - GITEA_DB_USER=gitea db: image: postgres:15.6 + deploy: + labels: + backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql" + backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql" + backupbot.backup.path: "/var/lib/postgresql/data" environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea diff --git a/compose.yml b/compose.yml index 41acfb8..a9cba67 100644 --- a/compose.yml +++ b/compose.yml @@ -71,6 +71,7 @@ services: failure_action: rollback order: start-first labels: + - "backupbot.backup=true" - "traefik.enable=true" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" -- 2.47.2 From 92073fbba552cedfc8e137bc73ab9698223bf72a Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 30 Apr 2024 14:54:27 +0200 Subject: [PATCH 289/304] fix backup label --- compose.mariadb.yml | 1 + compose.postgres.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 2c20754..4fc83f2 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -11,6 +11,7 @@ services: image: "mariadb:10.11.2" deploy: labels: + backupbot.backup: "true" backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql' backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql" backupbot.backup.path: "/var/lib/mysql/backup.sql" diff --git a/compose.postgres.yml b/compose.postgres.yml index 37f1aa7..0dea3b6 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -11,6 +11,7 @@ services: image: postgres:15.6 deploy: labels: + backupbot.backup: "true" backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql" backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql" backupbot.backup.path: "/var/lib/postgresql/data" -- 2.47.2 From 9687f7f738fa842243377c264f6513302bd3eeed Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 13 May 2024 16:20:13 +0200 Subject: [PATCH 290/304] chore: publish 2.8.0+1.21.11-rootless release --- compose.forgejo.yml | 2 +- compose.postgres.yml | 2 +- compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.forgejo.yml b/compose.forgejo.yml index 52d8279..f69db5e 100644 --- a/compose.forgejo.yml +++ b/compose.forgejo.yml @@ -2,4 +2,4 @@ version: '3.8' services: app: - image: codeberg.org/forgejo/forgejo:1.19.3-0-rootless + image: codeberg.org/forgejo/forgejo:1.21.11-1-rootless diff --git a/compose.postgres.yml b/compose.postgres.yml index 0dea3b6..1dedd51 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.6 + image: postgres:15.7 deploy: labels: backupbot.backup: "true" diff --git a/compose.yml b/compose.yml index a9cba67..40f49de 100644 --- a/compose.yml +++ b/compose.yml @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.7.0+1.21.11-rootless + - coop-cloud.${STACK_NAME}.version=2.8.0+1.21.11-rootless networks: -- 2.47.2 From c5dada903eb31c859d48f9f535a8ee675406de7f Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 3 Jul 2024 14:26:42 -0400 Subject: [PATCH 291/304] chore: publish 2.9.0+1.22.0-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 40f49de..00563a3 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.21.11-rootless" + image: "gitea/gitea:1.22.0-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.8.0+1.21.11-rootless + - coop-cloud.${STACK_NAME}.version=2.9.0+1.22.0-rootless networks: -- 2.47.2 From 43d43fb2b78b6e42a7f171ced399396bc510f520 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 15 Aug 2024 12:24:30 +0200 Subject: [PATCH 292/304] fix APP_INI_VERSION --- abra.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abra.sh b/abra.sh index 873841a..f16a75b 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v17 +export APP_INI_VERSION=v18 export DOCKER_SETUP_SH_VERSION=v1 abra_backup_app() { -- 2.47.2 From 24e4b09b07131fc583435173a732b91071e75c4b Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 15 Aug 2024 12:25:05 +0200 Subject: [PATCH 293/304] chore: publish 2.9.1+1.22.0-rootless release --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 00563a3..a9b1841 100644 --- a/compose.yml +++ b/compose.yml @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.9.0+1.22.0-rootless + - coop-cloud.${STACK_NAME}.version=2.9.1+1.22.0-rootless networks: -- 2.47.2 From 8e8809fd07f5ea4e8863ad3ee7d89ccdf2b6cf69 Mon Sep 17 00:00:00 2001 From: Javielico Date: Fri, 23 Aug 2024 19:21:01 +0100 Subject: [PATCH 294/304] chore: publish 2.10.0+1.22.1-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index a9b1841..b9a0196 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.22.0-rootless" + image: "gitea/gitea:1.22.1-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.9.1+1.22.0-rootless + - coop-cloud.${STACK_NAME}.version=2.10.0+1.22.1-rootless networks: -- 2.47.2 From cae11a78e6791581fe0980e949e75ff74e927873 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 2 Oct 2024 14:01:17 -0400 Subject: [PATCH 295/304] chore: publish 2.10.1+1.22.2-rootless release --- compose.postgres.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.postgres.yml b/compose.postgres.yml index 1dedd51..2f23728 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -8,7 +8,7 @@ services: - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea db: - image: postgres:15.7 + image: postgres:15.8 deploy: labels: backupbot.backup: "true" diff --git a/compose.yml b/compose.yml index b9a0196..2a6ca81 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.22.1-rootless" + image: "gitea/gitea:1.22.2-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.10.0+1.22.1-rootless + - coop-cloud.${STACK_NAME}.version=2.10.1+1.22.2-rootless networks: -- 2.47.2 From bd57d6121bab3740c5c6113120b36e300fefeab7 Mon Sep 17 00:00:00 2001 From: Moritz Date: Thu, 24 Oct 2024 17:01:04 +0200 Subject: [PATCH 296/304] update backupbot label --- .drone.yml | 1 + .env.sample | 1 + abra.sh | 1 + compose.mariadb.yml | 6 ++---- compose.postgres.yml | 17 ++++++++++++----- compose.yml | 2 +- pg_backup.sh | 34 ++++++++++++++++++++++++++++++++++ 7 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 pg_backup.sh diff --git a/.drone.yml b/.drone.yml index 1dacea8..2eb49c8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: environment: APP_INI_VERSION: v1 DOCKER_SETUP_SH_VERSION: v1 + PG_BACKUP_VERSION: v1 DOMAIN: gitea.swarm-test.autonomic.zone GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION: true GITEA_APP_NAME: Git with solidaritea diff --git a/.env.sample b/.env.sample index 201bd65..7ef6a7a 100644 --- a/.env.sample +++ b/.env.sample @@ -3,6 +3,7 @@ TYPE=gitea DOMAIN=gitea.example.com LETS_ENCRYPT_ENV=production COMPOSE_FILE="compose.yml" +ENABLE_BACKUPS=true COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" diff --git a/abra.sh b/abra.sh index f16a75b..61e8dd7 100644 --- a/abra.sh +++ b/abra.sh @@ -1,5 +1,6 @@ export APP_INI_VERSION=v18 export DOCKER_SETUP_SH_VERSION=v1 +export PG_BACKUP_VERSION=v1 abra_backup_app() { _abra_backup_dir "app:/var/lib/gitea" diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 4fc83f2..301da3b 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -11,10 +11,9 @@ services: image: "mariadb:10.11.2" deploy: labels: - backupbot.backup: "true" backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql' - backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql" - backupbot.backup.path: "/var/lib/mysql/backup.sql" + backupbot.backup.volumes.mariadb.path: "backup.sql" + backupbot.restore.post-hook: "mariadb -u root -p\"$$(cat /run/secrets/db_root_password)\" gitea < /var/lib/mysql/backup.sql" command: | mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: @@ -40,4 +39,3 @@ secrets: volumes: mariadb: - internal: diff --git a/compose.postgres.yml b/compose.postgres.yml index 2f23728..24571b0 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -11,10 +11,9 @@ services: image: postgres:15.8 deploy: labels: - backupbot.backup: "true" - backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql" - backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql" - backupbot.backup.path: "/var/lib/postgresql/data" + backupbot.backup.pre-hook: "/pg_backup.sh backup" + backupbot.backup.volumes.db.path: "backup.sql" + backupbot.restore.post-hook: '/pg_backup.sh restore' environment: - POSTGRES_DB=gitea - POSTGRES_USER=gitea @@ -25,6 +24,10 @@ services: - db:/var/lib/postgresql/data networks: - internal + configs: + - source: pg_backup + target: /pg_backup.sh + mode: 0555 secrets: db_password: @@ -33,4 +36,8 @@ secrets: volumes: db: - internal: + +configs: + pg_backup: + name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION} + file: pg_backup.sh diff --git a/compose.yml b/compose.yml index 2a6ca81..e9607ff 100644 --- a/compose.yml +++ b/compose.yml @@ -71,7 +71,7 @@ services: failure_action: rollback order: start-first labels: - - "backupbot.backup=true" + - "backupbot.backup=${ENABLE_BACKUPS:-true}" - "traefik.enable=true" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" diff --git a/pg_backup.sh b/pg_backup.sh new file mode 100644 index 0000000..4029803 --- /dev/null +++ b/pg_backup.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -e + +BACKUP_FILE='/var/lib/postgresql/data/backup.sql' + +function backup { + export PGPASSWORD=$(cat $POSTGRES_PASSWORD_FILE) + pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE +} + +function restore { + cd /var/lib/postgresql/data/ + restore_config(){ + # Restore allowed connections + cat pg_hba.conf.bak > pg_hba.conf + su postgres -c 'pg_ctl reload' + } + # Don't allow any other connections than local + cp pg_hba.conf pg_hba.conf.bak + echo "local all all trust" > pg_hba.conf + su postgres -c 'pg_ctl reload' + trap restore_config EXIT INT TERM + + # Recreate Database + psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);" + createdb -U ${POSTGRES_USER} ${POSTGRES_DB} + psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE + + trap - EXIT INT TERM + restore_config +} + +$@ -- 2.47.2 From 2554109fab814675735965595791793897809779 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 29 Oct 2024 13:55:32 +0100 Subject: [PATCH 297/304] update forgejo to version 9.0.1 --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e9607ff..ac587a4 100644 --- a/compose.yml +++ b/compose.yml @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.10.1+1.22.2-rootless + - coop-cloud.${STACK_NAME}.version=2.11.0+1.22.2-rootless networks: -- 2.47.2 From 0bfb666dd0434523eaae1c28e3665a91bf7aca17 Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 29 Oct 2024 13:55:44 +0100 Subject: [PATCH 298/304] chore: publish 2.11.0+1.22.2-rootless release --- compose.forgejo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.forgejo.yml b/compose.forgejo.yml index f69db5e..033748a 100644 --- a/compose.forgejo.yml +++ b/compose.forgejo.yml @@ -2,4 +2,4 @@ version: '3.8' services: app: - image: codeberg.org/forgejo/forgejo:1.21.11-1-rootless + image: codeberg.org/forgejo/forgejo:9.0.1-rootless -- 2.47.2 From 7fec94eaec9cd2082ed32ec5828c1739f1a914d6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sun, 27 Oct 2024 12:15:53 -0400 Subject: [PATCH 299/304] chore: publish 3.0.0+1.22.2-rootless release --- .env.sample | 3 ++- abra.sh | 2 +- app.ini.tmpl | 5 +++-- compose.smtp.yml | 3 ++- compose.yml | 2 +- release/3.0.0+1.22.2-rootless | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 release/3.0.0+1.22.2-rootless diff --git a/.env.sample b/.env.sample index 7ef6a7a..06f0355 100644 --- a/.env.sample +++ b/.env.sample @@ -51,7 +51,8 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # SMTP Mailer # COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" # GITEA_SMTP_MAILER_ENABLED=1 -# GITEA_MAILER_HOST=mail.gandi.net:465 +# GITEA_MAILER_ADDR=mail.gandi.net +# GITEA_MAILER_PORT=465 # SECRET_SMTP_PASSWORD_VERSION=v1 # OATH2 Options diff --git a/abra.sh b/abra.sh index 61e8dd7..75ba4f2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v18 +export APP_INI_VERSION=v19 export DOCKER_SETUP_SH_VERSION=v1 export PG_BACKUP_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 896f5b5..3934684 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -71,11 +71,12 @@ JWT_SECRET = {{ secret "jwt_secret" }} [mailer] ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} -HOST = {{ env "GITEA_MAILER_HOST" }} +PROTOCOL = smtps +SMTP_ADDR = {{ env "GITEA_MAILER_ADDR" }} +SMTP_PORT = {{ env "GITEA_MAILER_PORT" }} USER = {{ env "GITEA_MAILER_USER" }} PASSWD = {{ secret "smtp_password" }} MAILER_TYPE = smtp -IS_TLS_ENABLED = true {{ end }} {{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }} diff --git a/compose.smtp.yml b/compose.smtp.yml index c0cf31d..96d9b15 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -5,7 +5,8 @@ services: app: environment: - GITEA_MAILER_FROM - - GITEA_MAILER_HOST + - GITEA_MAILER_ADDR + - GITEA_MAILER_PORT - GITEA_MAILER_USER secrets: - smtp_password diff --git a/compose.yml b/compose.yml index ac587a4..9982100 100644 --- a/compose.yml +++ b/compose.yml @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=2.11.0+1.22.2-rootless + - coop-cloud.${STACK_NAME}.version=3.0.0+1.22.2-rootless networks: diff --git a/release/3.0.0+1.22.2-rootless b/release/3.0.0+1.22.2-rootless new file mode 100644 index 0000000..50ac439 --- /dev/null +++ b/release/3.0.0+1.22.2-rootless @@ -0,0 +1,3 @@ +BEWARE! 🚨 This release updates to the newer Gitea SMTP settings format. + +If you are using SMTP, you will need to split the old GITEA_MAILER_HOST into separate GITEA_MAILER_ADDR (hostname) and GITEA_MAILER_PORT settings. -- 2.47.2 From daf4a26f722255a6056ea5b99e689766c761e757 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Wed, 30 Oct 2024 13:36:29 -0400 Subject: [PATCH 300/304] chore: publish 3.0.1+1.22.3-rootless release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 9982100..cf517c0 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "gitea/gitea:1.22.2-rootless" + image: "gitea/gitea:1.22.3-rootless" configs: - source: app_ini target: /etc/gitea/app.ini @@ -85,7 +85,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100" - "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true" - - coop-cloud.${STACK_NAME}.version=3.0.0+1.22.2-rootless + - coop-cloud.${STACK_NAME}.version=3.0.1+1.22.3-rootless networks: -- 2.47.2 From b4273a95e34602988d986ca00a92f62c0d64b594 Mon Sep 17 00:00:00 2001 From: f Date: Tue, 7 Jan 2025 10:15:46 -0300 Subject: [PATCH 301/304] feat: sqlite3 support --- .env.sample | 1 + abra.sh | 2 +- app.ini.tmpl | 5 +++++ compose.mariadb.yml | 2 ++ compose.postgres.yml | 2 ++ compose.sqlite3.yml | 8 ++++++++ compose.yml | 1 - 7 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 compose.sqlite3.yml diff --git a/.env.sample b/.env.sample index 06f0355..489a6c4 100644 --- a/.env.sample +++ b/.env.sample @@ -5,6 +5,7 @@ LETS_ENCRYPT_ENV=production COMPOSE_FILE="compose.yml" ENABLE_BACKUPS=true COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" # Enable to use forgejo instead of gitea diff --git a/abra.sh b/abra.sh index 75ba4f2..72c6ada 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v19 +export APP_INI_VERSION=v20 export DOCKER_SETUP_SH_VERSION=v1 export PG_BACKUP_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 3934684..fd24780 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -2,10 +2,15 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} [database] DB_TYPE = {{ env "GITEA_DB_TYPE" }} +{{ if ne (env "GITEA_DB_TYPE") "sqlite3" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} +{{ else }} +SQLITE_JOURNAL_MODE = {{ env "GITEA_SQLITE_JOURNAL_MODE" }} +PATH = {{ env "GITEA_PATH" }} +{{ end }} [picture] DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }} diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 301da3b..b4cc117 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -7,6 +7,8 @@ services: - GITEA_DB_HOST="db:3306" - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea + secrets: + - db_password db: image: "mariadb:10.11.2" deploy: diff --git a/compose.postgres.yml b/compose.postgres.yml index 24571b0..e7ebc06 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -7,6 +7,8 @@ services: - GITEA_DB_HOST="db:5432" - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea + secrets: + - db_password db: image: postgres:15.8 deploy: diff --git a/compose.sqlite3.yml b/compose.sqlite3.yml new file mode 100644 index 0000000..42013d9 --- /dev/null +++ b/compose.sqlite3.yml @@ -0,0 +1,8 @@ +version: '3.8' + +services: + app: + environment: + - GITEA_DB_TYPE=sqlite3 + - GITEA_SQLITE_JOURNAL_MODE=wal + - GITEA_PATH=/var/lib/gitea/gitea.db diff --git a/compose.yml b/compose.yml index cf517c0..497bd83 100644 --- a/compose.yml +++ b/compose.yml @@ -11,7 +11,6 @@ services: target: /usr/local/bin/docker-setup.sh mode: 0555 secrets: - - db_password - internal_token - jwt_secret - secret_key -- 2.47.2 From 25fd554ab7d5a63b11e740ce7c49adddffd452ab Mon Sep 17 00:00:00 2001 From: f Date: Tue, 7 Jan 2025 10:15:53 -0300 Subject: [PATCH 302/304] feat: upgrade forgejo --- compose.forgejo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.forgejo.yml b/compose.forgejo.yml index 033748a..8508c67 100644 --- a/compose.forgejo.yml +++ b/compose.forgejo.yml @@ -2,4 +2,4 @@ version: '3.8' services: app: - image: codeberg.org/forgejo/forgejo:9.0.1-rootless + image: codeberg.org/forgejo/forgejo:9.0.3-rootless -- 2.47.2 From b84edcbe757ffc4017d997712c07036228fa676a Mon Sep 17 00:00:00 2001 From: f Date: Tue, 7 Jan 2025 11:21:25 -0300 Subject: [PATCH 303/304] feat: support other smtp protocols --- .env.sample | 1 + abra.sh | 2 +- app.ini.tmpl | 2 +- compose.smtp.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index 06f0355..1b5fb71 100644 --- a/.env.sample +++ b/.env.sample @@ -54,6 +54,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64 # GITEA_MAILER_ADDR=mail.gandi.net # GITEA_MAILER_PORT=465 # SECRET_SMTP_PASSWORD_VERSION=v1 +# GITEA_MAILER_PROTOCOL=smtps # OATH2 Options # GITEA_REGISTER_EMAIL_CONFIRM=replace-me diff --git a/abra.sh b/abra.sh index 75ba4f2..72c6ada 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v19 +export APP_INI_VERSION=v20 export DOCKER_SETUP_SH_VERSION=v1 export PG_BACKUP_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 3934684..ae5b998 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -71,7 +71,7 @@ JWT_SECRET = {{ secret "jwt_secret" }} [mailer] ENABLED = true FROM = {{ env "GITEA_MAILER_FROM" }} -PROTOCOL = smtps +PROTOCOL = {{ env "GITEA_MAILER_PROTOCOL" }} SMTP_ADDR = {{ env "GITEA_MAILER_ADDR" }} SMTP_PORT = {{ env "GITEA_MAILER_PORT" }} USER = {{ env "GITEA_MAILER_USER" }} diff --git a/compose.smtp.yml b/compose.smtp.yml index 96d9b15..60ac7d0 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -8,6 +8,7 @@ services: - GITEA_MAILER_ADDR - GITEA_MAILER_PORT - GITEA_MAILER_USER + - GITEA_MAILER_PROTOCOL secrets: - smtp_password -- 2.47.2 From fb45547f0d79f9b81db591649884a43d3fb01d19 Mon Sep 17 00:00:00 2001 From: f Date: Tue, 7 Jan 2025 14:26:12 -0300 Subject: [PATCH 304/304] fix: provide default --- compose.smtp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.smtp.yml b/compose.smtp.yml index 60ac7d0..ebd2069 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -8,7 +8,7 @@ services: - GITEA_MAILER_ADDR - GITEA_MAILER_PORT - GITEA_MAILER_USER - - GITEA_MAILER_PROTOCOL + - "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_FROM:-smtps}" secrets: - smtp_password -- 2.47.2